commit | 80912e675720723442e5c4b93d924fea1a1d320a | [log] [tgz] |
---|---|---|
author | Yuta HIGUCHI <y-higuchi@onlab.us> | Sun Oct 12 00:15:47 2014 -0700 |
committer | Yuta HIGUCHI <y-higuchi@onlab.us> | Sun Oct 12 00:15:47 2014 -0700 |
tree | ce5a1fc32ec829009ebdeba70ef4d6eb5027099e | |
parent | 98885517852de0553990d0ae4541abf11e7a29b1 [diff] |
Separate cluster management and mastership management to separate packages Change-Id: If1e399648451842da6dccc644b75b81337b105f9
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/device/impl/DeviceClockManager.java b/core/store/dist/src/main/java/org/onlab/onos/store/device/impl/DeviceClockManager.java index 6c83c9a..48355cf 100644 --- a/core/store/dist/src/main/java/org/onlab/onos/store/device/impl/DeviceClockManager.java +++ b/core/store/dist/src/main/java/org/onlab/onos/store/device/impl/DeviceClockManager.java
@@ -10,7 +10,7 @@ import org.apache.felix.scr.annotations.Component; import org.apache.felix.scr.annotations.Deactivate; import org.apache.felix.scr.annotations.Service; -import org.onlab.onos.cluster.MastershipTerm; +import org.onlab.onos.mastership.MastershipTerm; import org.onlab.onos.net.DeviceId; import org.onlab.onos.net.device.DeviceClockProviderService; import org.onlab.onos.net.device.DeviceClockService;
diff --git a/core/store/dist/src/test/java/org/onlab/onos/store/device/impl/GossipDeviceStoreTest.java b/core/store/dist/src/test/java/org/onlab/onos/store/device/impl/GossipDeviceStoreTest.java index 0e842ec..141f2b2 100644 --- a/core/store/dist/src/test/java/org/onlab/onos/store/device/impl/GossipDeviceStoreTest.java +++ b/core/store/dist/src/test/java/org/onlab/onos/store/device/impl/GossipDeviceStoreTest.java
@@ -31,8 +31,8 @@ import org.onlab.onos.cluster.ControllerNode; import org.onlab.onos.cluster.ControllerNode.State; import org.onlab.onos.cluster.DefaultControllerNode; -import org.onlab.onos.cluster.MastershipTerm; import org.onlab.onos.cluster.NodeId; +import org.onlab.onos.mastership.MastershipTerm; import org.onlab.onos.net.Annotations; import org.onlab.onos.net.DefaultAnnotations; import org.onlab.onos.net.Device;