Merge with latest changes. 91/1591/2
authorSuchi Raman <suchi.raman@plexxi.com>
Tue, 1 Oct 2013 22:21:47 +0000 (18:21 -0400)
committerGerrit Code Review <gerrit@opendaylight.org>
Wed, 2 Oct 2013 15:10:31 +0000 (15:10 +0000)
commit1a08f40dadbe715e67f9b18fd985815ed4fb6c9c
tree7477bc2d214605ba4967e1e809031275afcccdde
parent5efcc9a848bfd52decc50f3a86feec4ee1134a08
Merge with latest changes.
Signed-off-by: Suchi Raman <suchi.raman@plexxi.com>
affinity/implementation/src/main/java/org/opendaylight/affinity/affinity/internal/Activator.java