| commit | 65efaefeb1324798e659fd7aae0605d9568efc96 | [log] [tgz] |
|---|---|---|
| author | Ayaka Koshibe <ayaka@onlab.us> | Mon Sep 29 18:21:56 2014 -0700 |
| committer | Ayaka Koshibe <ayaka@onlab.us> | Mon Sep 29 18:21:56 2014 -0700 |
| tree | 53eb77b399ac253fefe70732b3a6336a80db5cd6 | |
| parent | d9f693e621fcdb985fd7108e5ad91886d934c7ba [diff] | |
| parent | 39244e0f1ebfa6ff4871c0131278a18d26802077 [diff] |
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