commit c0aa04c980cc37535de3b10b440e31e25044caf2
author Saurav Das <sauravdas@alumni.stanford.edu> Mon Sep 22 10:22:23 2014 -0700
committer Saurav Das <sauravdas@alumni.stanford.edu> Thu Sep 25 16:57:38 2014 -0700
tree c2418b8eb18097ed6d3699ad9928e4c53217ae10
parent df783aec6e9580c25a01dc72f0419ab9fb9623d1

Resetting onos properties file

Change-Id: Ic8c7f304cdce3e3fc70b0d79f4752d8de43e580b

conf/onos.properties

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
+