From 09977a2e04e0098ea238becf2259113db220f27b Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Mon, 6 Mar 2017 14:58:59 +0000 Subject: [PATCH] Updated weaveworks/common, plus dependencies Needed for peer discovery client calls --- .gitmodules | 6 ++++++ vendor/github.com/weaveworks/common | 2 +- vendor/golang.org/x/net | 1 + vendor/google.golang.org/grpc | 1 + 4 files changed, 9 insertions(+), 1 deletion(-) create mode 160000 vendor/golang.org/x/net create mode 160000 vendor/google.golang.org/grpc diff --git a/.gitmodules b/.gitmodules index 918c7914..cb055f87 100644 --- a/.gitmodules +++ b/.gitmodules @@ -124,3 +124,9 @@ [submodule "vendor/github.com/containernetworking/cni"] path = vendor/github.com/containernetworking/cni url = https://github.com/containernetworking/cni +[submodule "vendor/golang.org/x/net"] + path = vendor/golang.org/x/net + url = https://go.googlesource.com/net +[submodule "vendor/google.golang.org/grpc"] + path = vendor/google.golang.org/grpc + url = https://github.com/grpc/grpc-go diff --git a/vendor/github.com/weaveworks/common b/vendor/github.com/weaveworks/common index 08ae9c83..14d8aacf 160000 --- a/vendor/github.com/weaveworks/common +++ b/vendor/github.com/weaveworks/common @@ -1 +1 @@ -Subproject commit 08ae9c839237b80dd6fd41b8570573d1528cec3b +Subproject commit 14d8aacf4ca7808fa278dca181fb6669a02dabd1 diff --git a/vendor/golang.org/x/net b/vendor/golang.org/x/net new file mode 160000 index 00000000..d379faa2 --- /dev/null +++ b/vendor/golang.org/x/net @@ -0,0 +1 @@ +Subproject commit d379faa25cbdc04d653984913a2ceb43b0bc46d7 diff --git a/vendor/google.golang.org/grpc b/vendor/google.golang.org/grpc new file mode 160000 index 00000000..1dab9337 --- /dev/null +++ b/vendor/google.golang.org/grpc @@ -0,0 +1 @@ +Subproject commit 1dab93372523195731c738b0f0cb4e452228e959