commit 13379fe1f356f8d6f8b5f052b94ef2bfaada0047
author admin <admin@TestStation.(none)> Wed Aug 14 16:57:35 2013 -0700
committer admin <admin@TestStation.(none)> Wed Aug 14 16:57:35 2013 -0700
tree 8ba99aca4e259c8dccc2ac609318d4cbe5d9704f
parent 530b4c933d2969767bdbf98b1d2bb4d25a899f47
parent 229277f2a177afe10c76af83686b38645fe2abe3

Driver fixes, Device device discovery in Sanity, two case additions to Perf

TestON/tests/MininetTest/MininetTest.topo

diff --git a/TestON/tests/MininetTest/MininetTest.topo b/TestON/tests/MininetTest/MininetTest.topo
index 1515f57..46608e1 100644
--- a/TestON/tests/MininetTest/MininetTest.topo
+++ b/TestON/tests/MininetTest/MininetTest.topo
@@ -66,9 +66,15 @@
             <connect_order>9</connect_order>
         </ONOS4>
         <Mininet1>
+<<<<<<< HEAD
             <host>10.128.100.11</host>
             <user>admin</user>
             <password>onos_test</password>
+=======
+            <host>10.128.100.15</host>
+            <user>user_one</user>
+            <password></password>
+>>>>>>> 229277f2a177afe10c76af83686b38645fe2abe3
             <type>MininetCliDriver</type>
             <COMPONENTS>
                 # Specify the Option for mininet