commit 85df1ecbf31114583d3799b2c9345cd89e704c2b
author Srikanth Vavilapalli <srikanthvavila@gmail.com> Wed Sep 17 20:37:20 2014 -0700
committer Srikanth Vavilapalli <srikanthvavila@gmail.com> Wed Sep 17 20:37:20 2014 -0700
tree 366a8f8860130b15f3dc4f0d3c518330295895ed
parent 2ed83ddabf826125f0492a0f25f1a28aa2d2ebaf

merge

conf/onos.properties

diff --git a/conf/onos.properties b/conf/onos.properties
index a42eab9..842222a 100644
--- a/conf/onos.properties
+++ b/conf/onos.properties
@@ -22,4 +22,5 @@
 # Uncomment and list all the ZooKeeper instances after localhost on multi-instance deployment.
 #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