commit dc86de726a75a89cbc4acb0a1cfa044f33793e8e
author Yuta HIGUCHI <y-higuchi@ak.jp.nec.com> Wed Nov 08 20:43:27 2017 -0800
committer Yuta HIGUCHI <y-higuchi@opennetworking.org> Fri Nov 10 03:45:01 2017 +0000
tree ad5d95c3f65557e6d059009888802ef3baac736d
parent bf7d39bd7515f3fd2f93b6b81d0752fc7a0cba0c

rolling back to netty 4.1.8

Change-Id: I6dd305780eda38bb1ad6edb32de4d9aeca3d96ea

protocols/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/Controller.java

diff --git a/protocols/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/Controller.java b/protocols/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/Controller.java
index 099c207..e9a1f64 100644
--- a/protocols/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/Controller.java
+++ b/protocols/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/Controller.java
@@ -221,7 +221,7 @@
      */
     public void start() {
         log.info("Started");
-        if (!PlatformDependent.isWindows() && !PlatformDependent.maybeSuperUser()) {
+        if (!PlatformDependent.isWindows() && !PlatformDependent.isRoot()) {
             portNumber = BGP_PRIVILEGED_PORT;
         } else {
             portNumber = BGP_PORT_NUM;

protocols/openflow/ctl/pom.xml

diff --git a/protocols/openflow/ctl/pom.xml b/protocols/openflow/ctl/pom.xml
index 5de0900..c21b0f6 100644
--- a/protocols/openflow/ctl/pom.xml
+++ b/protocols/openflow/ctl/pom.xml
@@ -115,7 +115,7 @@
                         </Embed-Dependency>
                         <Embed-Transitive>false</Embed-Transitive>
                         <Bundle-NativeCode>
-                            META-INF/native/libnetty_transport_native_epoll_x86_64.so;osname=linux;processor=x86_64,
+                            META-INF/native/libnetty-transport-native-epoll.so;osname=linux;processor=x86_64,
                             *
                         </Bundle-NativeCode>
                         <Import-Package>