Added a previously failed merge. 06/1106/1
authorSuchi Raman <suchi.raman@plexxi.com>
Thu, 5 Sep 2013 21:13:45 +0000 (17:13 -0400)
committerSuchi Raman <suchi.raman@plexxi.com>
Thu, 5 Sep 2013 21:13:45 +0000 (17:13 -0400)
commitba32edae8c5584444a229af5ab0c6c471b3b6f0f
treebc3141df0b49d56f7477f659afff60aaa2fe9e9a
parent6b52953449a21b01a5674b85e9b4f856127fcd8d
Added a previously failed merge.
Signed-off-by: Suchi Raman <suchi.raman@plexxi.com>
affinity/api/META-INF/MANIFEST.MF
affinity/api/src/main/java/org/opendaylight/controller/affinity/AffinityGroup.java
affinity/api/src/main/java/org/opendaylight/controller/affinity/AffinityIdentifier.java
affinity/api/src/main/java/org/opendaylight/controller/affinity/IAffinityManager.java
affinity/implementation/META-INF/MANIFEST.MF
affinity/implementation/pom.xml
affinity/implementation/src/main/java/org/opendaylight/controller/affinity/internal/AffinityManagerImpl.java
affinity/implementation/src/test/java/org/opendaylight/controller/affinity/internal/AffinityManagerImplTest.java
affinity/northbound/src/main/resources/META-INF/MANIFEST.MF