tree 53eb77b399ac253fefe70732b3a6336a80db5cd6
parent d9f693e621fcdb985fd7108e5ad91886d934c7ba
parent 39244e0f1ebfa6ff4871c0131278a18d26802077
author Ayaka Koshibe <ayaka@onlab.us> 1412040116 -0700
committer Ayaka Koshibe <ayaka@onlab.us> 1412040116 -0700

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

Conflicts:
	core/net/src/main/java/org/onlab/onos/cluster/impl/MastershipManager.java
	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: I6a8b756fc20968e18ea3fd145e155d6282cea945