Fix manual hack of glide.lock file from openshift#1517. (openshift#1543)

jpeeler · Nov 9, 2017 · f86b8aa · f86b8aa
1 parent 02a5ff6
commit f86b8aa
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/glide.lock b/glide.lock
diff --git a/glide.yaml b/glide.yaml
@@ -4,6 +4,9 @@ import:
   version: ff4f55a206334ef123e4f79bbf348980da81ca46
   subpackages:
   - swagger
+# This is a dependency of github.com/emicklei/go-restful
+- package: google.golang.org/appengine
+  version: 24e4144ec923c2374f6b06610c0df16a9222c3d9
 - package: github.com/PuerkitoBio/purell
   version: 8a290539e2e8629dbc4e6bad948158f790ec31f4
 - package: github.com/spf13/pflag

diff --git a/vendor/k8s.io/apiserver/pkg/admission/plugin/namespace/lifecycle/admission.go b/vendor/k8s.io/apiserver/pkg/admission/plugin/namespace/lifecycle/admission.go