tree 0d998db8f2914eb36aa486a7f34af0e00e0e535b
parent c4047709262cde23eb91b62fccdf7b35049f3748
parent f10fcf68395ced9f9cf10fe0f1540c611339ee50
author Ayaka Koshibe <ayaka@onlab.us> 1412813656 -0700
committer Ayaka Koshibe <ayaka@onlab.us> 1412813656 -0700

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

Conflicts:
	core/net/src/main/java/org/onlab/onos/net/device/impl/DeviceManager.java
	core/store/hz/cluster/src/main/java/org/onlab/onos/store/cluster/impl/DistributedMastershipStore.java

Change-Id: Ia1274657b27e01366a4a87196a13068d7104ee80