Commits · e6e63437becc192fc3975089e391869a853ddd3c · 홍길동 / onos · GitLab

10 Oct, 2014 4 commits
- Merge branch 'master' of ssh://gerrit.onlab.us:29418/onos-next · e6e63437 ...
  e6e63437 Browse Files
```
Conflicts:
	core/api/src/main/java/org/onlab/onos/net/ElementId.java
```
  tom authored 2014-10-09 17:48:57 -0700
- checkstyle fix · bccb6be9
  bccb6be9 Browse Files
  
  Yuta HIGUCHI authored 2014-10-09 17:20:29 -0700
- Optimizing performance of HostId. · 545708e1
  545708e1 Browse Files
  
  tom authored 2014-10-09 17:10:02 -0700
- LINC-OE Optical Switch Driveri changes · e48aa68c
  e48aa68c Browse Files
  
  Praseed Balakrishnan authored 2014-10-09 17:00:54 -0700
09 Oct, 2014 36 commits
- Reverting ElementId hashCode + equals logic, which was breaking TopologyManagerTest · f5ba8bc8 ...
  f5ba8bc8 Browse Files
```
- requires further investigation later

Change-Id: I22de937c1ffdd60f674813e5e5dd10b0ddce524b
```
  Yuta HIGUCHI authored 2014-10-09 16:02:29 -0700
- Revert "Refactoring to move code to right locations. Attempt at breaking dependency cycles." · fa891c9a ...
  fa891c9a Browse Files
```
This reverts commit 58819b4d.
```
  Yuta HIGUCHI authored 2014-10-09 15:28:45 -0700
- Revert "Renamed *MastershipStore* to *DeviceMastershipStore*" · 89791c60 ...
  89791c60 Browse Files
```
This reverts commit da147db7.
```
  Yuta HIGUCHI authored 2014-10-09 15:28:45 -0700
- Revert "Refactored code in an attempt to break dependency cycles" · d40483d5 ...
  d40483d5 Browse Files
```
This reverts commit 195af6e6.
```
  Yuta HIGUCHI authored 2014-10-09 15:28:45 -0700
- Merge remote-tracking branch 'origin/master' · 74be6c43
  74be6c43 Browse Files
  
  tom authored 2014-10-09 15:06:11 -0700
- Oooops... · e5a21208
  e5a21208 Browse Files
  
  tom authored 2014-10-09 15:05:20 -0700
- Merge branch 'master' of ssh://gerrit.onlab.us:29418/onos-next · 782196a7
  782196a7 Browse Files
  
  Madan Jampani authored 2014-10-09 15:01:25 -0700
- Refactored code in an attempt to break dependency cycles · 195af6e6
  195af6e6 Browse Files
  
  Madan Jampani authored 2014-10-09 15:01:17 -0700
- Use existing JAVA_HOME if one is set · 8af03738
  8af03738 Browse File
  
  Jonathan Hart authored 2014-10-09 14:57:00 -0700
- Renamed *MastershipStore* to *DeviceMastershipStore* · da147db7
  da147db7 Browse Files
  
  Madan Jampani authored 2014-10-09 13:53:15 -0700
- Merge remote-tracking branch 'origin/master' · 26673baf
  26673baf Browse Files
  
  tom authored 2014-10-09 13:51:01 -0700
- Eliminating some performance bottlenecks; more to be done. · 1679e180
  1679e180 Browse Files
  
  tom authored 2014-10-09 13:50:45 -0700
- Refactoring to move code to right locations. Attempt at breaking dependency cycles. · 58819b4d
  58819b4d Browse Files
  
  Madan Jampani authored 2014-10-09 13:48:51 -0700
- Merge branch 'master' of ssh://gerrit.onlab.us:29418/onos-next · f1a2d0ed
  f1a2d0ed Browse Files
  
  Madan Jampani authored 2014-10-09 12:08:23 -0700
- GossipDeviceStore: Notifying applications of latest topology events received from peers · 255a58b8
  255a58b8 Browse Files
  
  Madan Jampani authored 2014-10-09 12:08:20 -0700
- Add TCP src/dst port traffic selection criteria to TrafficSelector · 9c44c9a9
  9c44c9a9 Browse Files
  
  Toshio Koide authored 2014-10-09 11:46:31 -0700
- Fix javadoc on IntentStore and add newline at the end of the intent package-info. · d32809be
  d32809be Browse Files
  
  Toshio Koide authored 2014-10-09 11:00:29 -0700
- Unit tests for the ProxyArpManager. · 704ca14a
  704ca14a Browse Files
  
  Jonathan Hart authored 2014-10-09 10:46:24 -0700
- Added protection against project patterns starting with - for onos-push-update-bundle. · 3f146400
  3f146400
  
  tom authored 2014-10-08 22:44:56 -0700
- Added output of appId to the flow list command. Fixed defect in CoreManager - we… · a689779d ...
  a689779d
```
… forgot to put registered ids in our map.
```
  tom authored 2014-10-08 22:21:05 -0700
- Merge branch 'master' of ssh://gerrit.onlab.us:29418/onos-next · 05be0eed
  05be0eed Browse Files
  
  alshabib authored 2014-10-08 21:56:15 -0700
- real application ids · 92c65ad4 ...
  92c65ad4
```
Change-Id: Ia24f1de6ccff614769727ab261002520dfd8506f
```
  alshabib authored 2014-10-08 21:56:05 -0700
- Merge remote-tracking branch 'origin/master' · 2f182f6b
  2f182f6b Browse Files
  
  tom authored 2014-10-08 20:22:13 -0700
- Fixed 'obs' to trigger when any Java source file is newer than the target directory. · 1a17eb47
  1a17eb47 Browse Directory
  
  tom authored 2014-10-08 20:21:23 -0700
- some extra comments · c7e1cb63 ...
  c7e1cb63 Browse Files
```
Change-Id: Icde01e92c15b716a32cacfb658cb93f42234ab34
```
  alshabib authored 2014-10-08 20:20:03 -0700
- Merge branch 'master' of ssh://gerrit.onlab.us:29418/onos-next · 166f1a58
  166f1a58 Browse Files
  
  alshabib authored 2014-10-08 20:15:56 -0700
- you must call get on futures · 26834584 ...
  26834584 Browse Files
```
Change-Id: I2ed3a9b2250f2a1c6e2e68e35cec50e691702099
```
  alshabib authored 2014-10-08 20:15:46 -0700
- Merge remote-tracking branch 'origin/master' · 43c4f3da
  43c4f3da Browse Files
  
  tom authored 2014-10-08 19:03:35 -0700
- Added onos-watch command. · e331eb4c
  e331eb4c Browse File
  
  tom authored 2014-10-08 19:03:32 -0700
- Merge branch 'master' of ssh://gerrit.onlab.us:29418/onos-next · 79e6f89b
  79e6f89b Browse Files
  
  alshabib authored 2014-10-08 18:58:06 -0700
- clean batch operations · 193525bb ...
  193525bb Browse Files
```
Change-Id: I7187de40bb5276d6ae9e9831e5d47d36e16560ad
```
  alshabib authored 2014-10-08 18:58:03 -0700
- Initial implementation of async installers · cb900f4e
  cb900f4e Browse Files
  
  Brian O'Connor authored 2014-10-08 18:21:52 -0700
- Order the arguments · 31b8eabe
  31b8eabe Browse Files
  
  pankaj authored 2014-10-08 18:14:08 -0700
- minor role relinquishment fix · 1c292d77 ...
  1c292d77 Browse Files
```
Change-Id: I8fb2d65795b6bba6c0838c5efcf17d6f6528ea65
```
  Ayaka Koshibe authored 2014-10-08 17:46:07 -0700
- Merge branch 'master' of ssh://gerrit.onlab.us:29418/onos-next · 1b458550
  1b458550 Browse Files
  
  Ayaka Koshibe authored 2014-10-08 17:14:29 -0700
- Merge branch 'master' of ssh://gerrit.onlab.us:29418/onos-next · 4c891271 ...
  4c891271 Browse Files
```
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
```
  Ayaka Koshibe authored 2014-10-08 17:14:16 -0700