commit 8afa882f41c68dcedfcaf63f617ab75e45c94b06
author Masayoshi Kobayashi <masayoshi@onlab.us> Tue Apr 02 22:20:33 2013 +0000
committer Masayoshi Kobayashi <masayoshi@onlab.us> Tue Apr 02 22:20:33 2013 +0000
tree 86ba255ff62e3b3b4b38c52a8e9f84cba993a827
parent dc7f90e7ee54788eac3d3bdf5db2a1aa5f9a9147
parent 3d04931339458508aa51b238cf3baa66b44eac9d

Merge branch 'master' of github.com:OPENNETWORKINGLAB/ONOS

Conflicts:
	web/topology_rest.py

web/onos-topology.html

diff --git a/web/onos-topology.html b/web/onos-topology.html
index 9d90ea4..72e9fc4 100644
--- a/web/onos-topology.html
+++ b/web/onos-topology.html
@@ -52,8 +52,8 @@
 <div id="topology"></div>
 <script type="text/javascript" src="js/controller-status.js"></script>
 <script type="text/javascript">
-controller_status("http://gui.onlab.us:8080/controller_status");
-gui("http://gui.onlab.us:8080/topology");
+controller_status("http://gui3.onlab.us:8081/controller_status");
+gui("http://gui3.onlab.us:8081/topology");
 </script>
 </svg>
 </body>