tree 84fbf79b59abd3b79afed54f4d99ae7023a3acd6
parent 7911a05aae3847d400f72519342f077a0f4fac01
parent 711145a2844bc51386b070912dd5c5c00b6ea0ef
author alshabib <alshabibi.ali@gmail.com> 1413507820 -0700
committer alshabib <alshabibi.ali@gmail.com> 1413507820 -0700

Merge branch 'master' of ssh://gerrit.onlab.us:29418/onos-next

Conflicts:
	core/store/hz/net/src/main/java/org/onlab/onos/store/device/impl/DistributedDeviceStore.java
	core/store/hz/net/src/test/java/org/onlab/onos/store/device/impl/DistributedDeviceStoreTest.java
	features/features.xml
	tools/test/cells/office

Change-Id: I08e6d7c6a0bdaae072dd50ff7ac36d94f16d77e1