| commit | 21ea9b4eeb66f576318f8c9f054c1fc7e64f8147 | [log] [tgz] |
|---|---|---|
| author | tom <tom@onlab.us> | Wed Sep 24 16:30:55 2014 -0700 |
| committer | tom <tom@onlab.us> | Wed Sep 24 16:30:55 2014 -0700 |
| tree | b7d047a2ae6a0ebe8273f211018307098463edfa | |
| parent | dd61055cf0ba9e3350995b1474c785af8f92acde [diff] | |
| parent | a8714e54144fd1bd7549876131fc97e5789dda8d [diff] |
Merge remote-tracking branch 'origin/master'
diff --git a/core/api/src/main/java/org/onlab/onos/cluster/MastershipStore.java b/core/api/src/main/java/org/onlab/onos/cluster/MastershipStore.java index 08fa57b..5c0c207 100644 --- a/core/api/src/main/java/org/onlab/onos/cluster/MastershipStore.java +++ b/core/api/src/main/java/org/onlab/onos/cluster/MastershipStore.java
@@ -52,7 +52,6 @@ * * @param nodeId controller instance identifier * @param deviceId device identifier - * @param role new role * @return a mastership event */ MastershipEvent setMaster(NodeId nodeId, DeviceId deviceId);