Merge pull request #198 from projectcalico/shaun-release-v3.6-auto-li…

…bcalico-update [release-v3.6] Automatic patch of libcalico-go to 7839c04a4298a37754608a3fb31c359325c1f732
projectcalico · Mar 20, 2019 · 8bc2f91 · 8bc2f91
2 parents 68301ac + d9a61fa
commit 8bc2f91
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/calico_test/requirements.txt b/calico_test/requirements.txt
@@ -1,9 +1,9 @@
-nose
+nose==1.3.7
-nose-timer
+nose-timer==0.7.1
-nose-parameterized
+nose-parameterized==0.6.0
-netaddr
+netaddr==0.7.19
-pyyaml
+pyyaml==3.12
-simplejson
+simplejson==3.13.2
-deepdiff
+deepdiff==3.3.0
 kubernetes
 pytest
diff --git a/glide.lock b/glide.lock
diff --git a/glide.yaml b/glide.yaml
@@ -9,7 +9,7 @@ import:
   version: 773f5027234d0b08adf766be34f55df2f312abf7
 - package: github.com/kelseyhightower/confd
   repo: https://github.com/projectcalico/confd.git
-  version: 990438064b40a2ccaa9e98c205ac5d85d47f93af
+  version: 238cdb043571b17251b0662582c22f462bc7451c
   subpackages:
   - pkg/config
   - pkg/run