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)
Signed-off-by: Suchi Raman <suchi.raman@plexxi.com>
affinity/implementation/src/main/java/org/opendaylight/affinity/affinity/internal/Activator.java

index a386eeecc184c4e73f7f8310ed5f41b5c96b8a5a..839559e21b22b087ef644e8f439c1e4bdda2e9b3 100644 (file)
@@ -107,12 +107,10 @@ public class Activator extends ComponentActivatorAbstractBase {
                     IClusterContainerServices.class).setCallbacks(
                     "setClusterContainerService",
                     "unsetClusterContainerService").setRequired(true));
-            /*
               c.add(createContainerServiceDependency(containerName).setService(
                     IFlowProgrammerService.class).setCallbacks(
                     "setFlowProgrammerService", "unsetFlowProgrammerService")
                     .setRequired(true));
-            */
             c.add(createContainerServiceDependency(containerName).setService(
                     ISwitchManager.class).setCallbacks(
                     "setSwitchManager", "unsetSwitchManager")