Merge pull request #1553 from rastislavszabo/master

Update to VPP Agent v2.1.0
contiv · May 16, 2019 · 3fc8548 · 3fc8548
2 parents 7c3679a + 0f38423
commit 3fc8548
Show file tree

Hide file tree

Showing 194 changed files with 11,825 additions and 22,089 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -44,7 +44,7 @@ required = [
 
 [[constraint]]
   name = "github.com/ligato/vpp-agent"
-  branch = "dev"
+  version = "2.1.0"
 
 [[constraint]]
   revision = "b5bfa59ec0adc420475f97f89b58045c721d761c"
@@ -139,12 +139,6 @@ required = [
   name = "k8s.io/code-generator"
   version = "kubernetes-1.11.0"
 
-# TODO: remove override once latest govpp can be compiled with vpp 19.01
-[[override]]
-  name = "git.fd.io/govpp.git"
-  source = "github.com/ligato/govpp.git"
-  branch = "vpp1901"
-
 [prune]
   go-tests = true
   unused-packages = true

diff --git a/vendor/git.fd.io/govpp.git/adapter/socketclient/socketclient.go b/vendor/git.fd.io/govpp.git/adapter/socketclient/socketclient.go