홍길동 / 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 @@ ...@@ -32,31 +32,19 @@
32 "nodes" : [ 32 "nodes" : [
33 { 33 {
34 "hostname" : "compute-01", 34 "hostname" : "compute-01",
35 -<<<<<<< HEAD
36 "ovsdbIp" : "10.40.101.208", 35 "ovsdbIp" : "10.40.101.208",
37 -=======
38 - "ovsdbIp" : "127.0.0.1",
39 ->>>>>>> 6a78e2e... SONA: OpenstackSwitching - remove flows
40 "ovsdbPort" : "6640", 36 "ovsdbPort" : "6640",
41 "bridgeId" : "of:0000000000000001" 37 "bridgeId" : "of:0000000000000001"
42 }, 38 },
43 { 39 {
44 "hostname" : "compute-02", 40 "hostname" : "compute-02",
45 -<<<<<<< HEAD
46 "ovsdbIp" : "10.40.101.227", 41 "ovsdbIp" : "10.40.101.227",
47 -=======
48 - "ovsdbIp" : "127.0.0.1",
49 ->>>>>>> 6a78e2e... SONA: OpenstackSwitching - remove flows
50 "ovsdbPort" : "6640", 42 "ovsdbPort" : "6640",
51 "bridgeId" : "of:0000000000000002" 43 "bridgeId" : "of:0000000000000002"
52 }, 44 },
53 { 45 {
54 "hostname" : "network", 46 "hostname" : "network",
55 -<<<<<<< HEAD
56 "ovsdbIp" : "10.40.101.209", 47 "ovsdbIp" : "10.40.101.209",
57 -=======
58 - "ovsdbIp" : "127.0.0.1",
59 ->>>>>>> 6a78e2e... SONA: OpenstackSwitching - remove flows
60 "ovsdbPort" : "6640", 48 "ovsdbPort" : "6640",
61 "bridgeId" : "of:0000000000000003" 49 "bridgeId" : "of:0000000000000003"
62 } 50 }
......