)]}' { "commit": "75e774203d925333229a244f1bcbc3a4daa94c5f", "tree": "84fbf79b59abd3b79afed54f4d99ae7023a3acd6", "parents": [ "7911a05aae3847d400f72519342f077a0f4fac01", "711145a2844bc51386b070912dd5c5c00b6ea0ef" ], "author": { "name": "alshabib", "email": "alshabibi.ali@gmail.com", "time": "Thu Oct 16 18:03:40 2014 -0700" }, "committer": { "name": "alshabib", "email": "alshabibi.ali@gmail.com", "time": "Thu Oct 16 18:03:40 2014 -0700" }, "message": "Merge branch \u0027master\u0027 of ssh://gerrit.onlab.us:29418/onos-next\n\nConflicts:\n\tcore/store/hz/net/src/main/java/org/onlab/onos/store/device/impl/DistributedDeviceStore.java\n\tcore/store/hz/net/src/test/java/org/onlab/onos/store/device/impl/DistributedDeviceStoreTest.java\n\tfeatures/features.xml\n\ttools/test/cells/office\n\nChange-Id: I08e6d7c6a0bdaae072dd50ff7ac36d94f16d77e1\n", "tree_diff": [] }