Merge pull request helm#3029 from bacongobbler/fix-glide

pin golang.org/x/sys to master
mynameiswhm · Oct 12, 2017 · 4f5cbed · 4f5cbed
2 parents e170392 + 4b9b780
commit 4f5cbed
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/glide.lock b/glide.lock
diff --git a/glide.yaml b/glide.yaml
@@ -27,14 +27,22 @@ import:
   - ptypes/timestamp
 - package: google.golang.org/grpc
   version: 1.2.1
+  # 1.8.1 libs are hosed and need some manual intervention, so pinning to 1.8.0 for now
+  # so others aren't getting errors when running `glide up`
 - package: k8s.io/kubernetes
-  version: ~1.8.0
+  version: 1.8.0
 - package: github.com/gosuri/uitable
 - package: github.com/asaskevich/govalidator
   version: ^4.0.0
 - package: golang.org/x/crypto
   subpackages:
   - openpgp
+  # pin version of golang.org/x/sys that is compatible with golang.org/x/crypto
+- package: golang.org/x/sys
+  version: 43eea11
+  subpackages:
+  - unix
+  - windows
 - package: github.com/gobwas/glob
   version: ^0.2.1
 - package: github.com/evanphx/json-patch