Merge pull request #18480 from jboyd01/revendor-catalog-0.1.5

Automatic merge from submit-queue. Revendor Service Catalog 0.1.5
openshift · Feb 8, 2018 · 057e3b3 · 057e3b3
2 parents 0427a13 + 1134e05
commit 057e3b3
Show file tree

Hide file tree

Showing 4,618 changed files with 232,866 additions and 351,727 deletions.
diff --git a/cmd/service-catalog/go/src/github.com/kubernetes-incubator/service-catalog/.gitignore b/cmd/service-catalog/go/src/github.com/kubernetes-incubator/service-catalog/.gitignore
@@ -10,7 +10,6 @@ bin/**
 coverage.html
 .idea/
 .DS_Store
-.glide
 .scBuildImage
 .init
 .generate*
@@ -20,5 +19,12 @@ contrib/build/*/tmp/*
 .pkg
 .kube
 .var
+.vscode
+vendor/github.com/petar/GoLLRB/doc/*
+contrib/examples/consumer/Gopkg.lock
+contrib/examples/consumer
+contrib/examples/vendor/*
 # this is for buildling service catalog with origin tooling
 _output
+/go/src/github.com/kubernetes-incubator/service-catalog/_output
+
diff --git a/cmd/service-catalog/go/src/github.com/kubernetes-incubator/service-catalog/.travis.yml b/cmd/service-catalog/go/src/github.com/kubernetes-incubator/service-catalog/.travis.yml
@@ -4,9 +4,9 @@ services:
 - docker
 cache:
   directories:
-  - .glide
+    - $GOPATH/pkg/dep
 script:
-- make verify build test images
+- make verify build build-integration build-e2e test images svcat
 deploy:
   skip_cleanup: true
   provider: script