Resetting onos properties file
Change-Id: Ic8c7f304cdce3e3fc70b0d79f4752d8de43e580b
diff --git a/conf/onos.properties b/conf/onos.properties
index 842222a..9115c0c 100644
--- a/conf/onos.properties
+++ b/conf/onos.properties
@@ -13,6 +13,7 @@
net.floodlightcontroller.restserver.RestApiServer.port = 8080
net.floodlightcontroller.core.FloodlightProvider.openflowport = 6633
net.floodlightcontroller.core.FloodlightProvider.workerthreads = 16
+net.floodlightcontroller.core.FloodlightProvider.cpqdUsePipeline13 = true
net.floodlightcontroller.forwarding.Forwarding.idletimeout = 5
net.floodlightcontroller.forwarding.Forwarding.hardtimeout = 0
net.onrc.onos.apps.websocket.WebSocketModule.port = 8081
@@ -23,4 +24,4 @@
#net.onrc.onos.core.registry.ZookeeperRegistry.connectionString = localhost:2181,otherhost:2181
# Specify a network configuration file to be used by the NetworkConfigManager
#net.onrc.onos.core.configmanager.NetworkConfigManager.networkConfigFile = conf/my_network.conf
-net.onrc.onos.core.configmanager.NetworkConfigManager.networkConfigFile = conf/sr.conf
+
diff --git a/src/main/java/net/onrc/onos/apps/segmentrouting/ECMPShortestPathGraph.java b/src/main/java/net/onrc/onos/apps/segmentrouting/ECMPShortestPathGraph.java
index a5df74b..0ca2977 100644
--- a/src/main/java/net/onrc/onos/apps/segmentrouting/ECMPShortestPathGraph.java
+++ b/src/main/java/net/onrc/onos/apps/segmentrouting/ECMPShortestPathGraph.java
@@ -33,8 +33,8 @@
.getLogger(SegmentRoutingManager.class);
/**
- * Constructor.
- *
+ * Constructor
+ *
* @param rootSwitch root of the BFS tree
*/
public ECMPShortestPathGraph(Switch rootSwitch) {