Merge remote-tracking branch 'origin/develop' into agent-performance

2016-04-04 10:49:35 +01:00
parent a226423258 f545a225a4
commit 224ec7c4a1
114 changed files with 758 additions and 314 deletions
@@ -144,7 +144,6 @@ eNBs =

        ENB_INTERFACE_NAME_FOR_S1U               = "eth0:4";
        ENB_IPV4_ADDRESS_FOR_S1U                 = "192.170.1.2/24";
-        ENB_IPV4_ADDRESS_FOR_S1U                 = "192.170.0.2/24";
        ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
    };

@@ -167,4 +166,4 @@ eNBs =
   };

  }
-);
+);