홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Hyunsun Moon
Committed by Gerrit Code Review
28dd15e0 1 parent 30d3f8be

Removed merge conflict comments 

Change-Id: I1b52123584d797f01f18912ff266c105e57795d4
Inline Side-by-side
Showing 1 changed file with 0 additions and 12 deletions
......@@ -32,31 +32,19 @@
"nodes" : [
{
"hostname" : "compute-01",
<<<<<<< HEAD
"ovsdbIp" : "10.40.101.208",
=======
"ovsdbIp" : "127.0.0.1",
>>>>>>> 6a78e2e... SONA: OpenstackSwitching - remove flows
"ovsdbPort" : "6640",
"bridgeId" : "of:0000000000000001"
},
{
"hostname" : "compute-02",
<<<<<<< HEAD
"ovsdbIp" : "10.40.101.227",
=======
"ovsdbIp" : "127.0.0.1",
>>>>>>> 6a78e2e... SONA: OpenstackSwitching - remove flows
"ovsdbPort" : "6640",
"bridgeId" : "of:0000000000000002"
},
{
"hostname" : "network",
<<<<<<< HEAD
"ovsdbIp" : "10.40.101.209",
=======
"ovsdbIp" : "127.0.0.1",
>>>>>>> 6a78e2e... SONA: OpenstackSwitching - remove flows
"ovsdbPort" : "6640",
"bridgeId" : "of:0000000000000003"
}
......