)]}' { "commit": "c69c66ae54b2e280591c989349a8221101c4ebc6", "tree": "87f4f63a495da0afe04428c256e690591dff4c9c", "parents": [ "63eeac3ea8bacb800f888b68b01f21e0f771652c" ], "author": { "name": "Kavitha Alagesan", "email": "kalagesa@partner.ciena.com", "time": "Wed Jun 15 14:26:04 2016 +0530" }, "committer": { "name": "Gerrit Code Review", "email": "gerrit@onlab.us", "time": "Mon Aug 08 17:56:09 2016 +0000" }, "message": "Merged master fixed conflict.\n\nChange-Id: I1260048f4cc90c422ce6033d506c25ec38d6cc3a\n", "tree_diff": [ { "type": "modify", "old_id": "61ea43dea2a39ffcb9ed66c2cb18b415a1d2bcaf", "old_mode": 33188, "old_path": "cli/src/main/java/org/onosproject/cli/net/WipeOutCommand.java", "new_id": "0e2879540863985270f813c88e5536a878f28b7e", "new_mode": 33188, "new_path": "cli/src/main/java/org/onosproject/cli/net/WipeOutCommand.java" }, { "type": "modify", "old_id": "9b8ef81a5cfa463d7a96251ab4004ca4e58a84c5", "old_mode": 33188, "old_path": "core/api/src/main/java/org/onosproject/net/flow/FlowRuleService.java", "new_id": "52af84aaa54e19354dae7434d80515676f243d7f", "new_mode": 33188, "new_path": "core/api/src/main/java/org/onosproject/net/flow/FlowRuleService.java" }, { "type": "modify", "old_id": "d56518a6a6aecfd69a0315bf2201cd68d660f5c8", "old_mode": 33188, "old_path": "core/api/src/main/java/org/onosproject/net/group/GroupService.java", "new_id": "369cc37b473ad32f6bea0f7c2f0ba0406b94fe5b", "new_mode": 33188, "new_path": "core/api/src/main/java/org/onosproject/net/group/GroupService.java" }, { "type": "modify", "old_id": "a12308d333128f35a77366e0197826f8fa308be9", "old_mode": 33188, "old_path": "core/api/src/test/java/org/onosproject/net/flow/FlowRuleServiceAdapter.java", "new_id": "43359832e5e263c12f85000454f4db274ff2e99c", "new_mode": 33188, "new_path": "core/api/src/test/java/org/onosproject/net/flow/FlowRuleServiceAdapter.java" }, { "type": "modify", "old_id": "6e0adbc378d0db35c1ba02d3bc6a28af8bee840f", "old_mode": 33188, "old_path": "core/net/src/main/java/org/onosproject/net/flow/impl/FlowRuleManager.java", "new_id": "e5220b5cc05698bc0901d3aa948d7f500fc292f9", "new_mode": 33188, "new_path": "core/net/src/main/java/org/onosproject/net/flow/impl/FlowRuleManager.java" }, { "type": "modify", "old_id": "091265ae7cc7ab880cb1a32486a8b07e1ab94393", "old_mode": 33188, "old_path": "core/net/src/main/java/org/onosproject/net/group/impl/GroupManager.java", "new_id": "1150d056968a44b5f47c0c9978cfc12d14e6d1a4", "new_mode": 33188, "new_path": "core/net/src/main/java/org/onosproject/net/group/impl/GroupManager.java" }, { "type": "modify", "old_id": "235699d74ab96dfed9b79b07cc03ebb78fa85cf0", "old_mode": 33188, "old_path": "core/net/src/test/java/org/onosproject/net/flow/impl/FlowRuleManagerTest.java", "new_id": "014cb9501ace8f92376c15dbd249105de8adb177", "new_mode": 33188, "new_path": "core/net/src/test/java/org/onosproject/net/flow/impl/FlowRuleManagerTest.java" }, { "type": "modify", "old_id": "40ed988d181327b35f6140e4b44446979dd6fda5", "old_mode": 33188, "old_path": "core/net/src/test/java/org/onosproject/net/group/impl/GroupManagerTest.java", "new_id": "065da4ddeecae0ded1a2e7134fb748bf88c82921", "new_mode": 33188, "new_path": "core/net/src/test/java/org/onosproject/net/group/impl/GroupManagerTest.java" } ] }