summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarek Gradzki <mgradzki@cisco.com>2016-09-29 13:41:55 +0200
committerMarek Gradzki <mgradzki@cisco.com>2016-09-29 13:41:58 +0200
commit59d7e8bbce13d0264858476342039ec5042a4c05 (patch)
treeb9bf3a47f0a04524da49b4b3067738894d47d1eb
parent31a1b1f2dd7d19c240859db51578085117cdd1cb (diff)
Disable NSH plugin due to CI issues
Will be reverted after merging https://gerrit.fd.io/r/#/c/3181/ Change-Id: Iab9e7d8a1e79cd96f84842071c62148aa9748b6f Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
-rw-r--r--vpp-integration/minimal-distribution/pom.xml10
-rw-r--r--vpp-integration/minimal-distribution/src/main/java/io/fd/honeycomb/vpp/integration/distro/Main.java3
2 files changed, 6 insertions, 7 deletions
diff --git a/vpp-integration/minimal-distribution/pom.xml b/vpp-integration/minimal-distribution/pom.xml
index 7e1aa0241..a10727849 100644
--- a/vpp-integration/minimal-distribution/pom.xml
+++ b/vpp-integration/minimal-distribution/pom.xml
@@ -75,10 +75,10 @@
<artifactId>lisp2vpp</artifactId>
<version>${lisp.version}</version>
</dependency>
- <dependency>
- <groupId>io.fd.honeycomb.vppnsh</groupId>
- <artifactId>vppnsh-impl</artifactId>
- <version>${vppnsh.version}</version>
- </dependency>
+ <!--<dependency>-->
+ <!--<groupId>io.fd.honeycomb.vppnsh</groupId>-->
+ <!--<artifactId>vppnsh-impl</artifactId>-->
+ <!--<version>${vppnsh.version}</version>-->
+ <!--</dependency>-->
</dependencies>
</project>
diff --git a/vpp-integration/minimal-distribution/src/main/java/io/fd/honeycomb/vpp/integration/distro/Main.java b/vpp-integration/minimal-distribution/src/main/java/io/fd/honeycomb/vpp/integration/distro/Main.java
index 04377c382..f4fbdb15c 100644
--- a/vpp-integration/minimal-distribution/src/main/java/io/fd/honeycomb/vpp/integration/distro/Main.java
+++ b/vpp-integration/minimal-distribution/src/main/java/io/fd/honeycomb/vpp/integration/distro/Main.java
@@ -21,7 +21,6 @@ import com.google.inject.Module;
import io.fd.honeycomb.lisp.LispModule;
import io.fd.honeycomb.translate.v3po.V3poModule;
import io.fd.honeycomb.vpp.distro.VppCommonModule;
-import io.fd.honeycomb.vppnsh.impl.VppNshModule;
import java.util.List;
public class Main {
@@ -33,7 +32,7 @@ public class Main {
sampleModules.add(new VppCommonModule());
sampleModules.add(new V3poModule());
sampleModules.add(new LispModule());
- sampleModules.add(new VppNshModule());
+// sampleModules.add(new VppNshModule());
io.fd.honeycomb.infra.distro.Main.init(sampleModules);
}