Merge pull request #53 from deniseschannon/v0143

bump rancher-compose-executor to v0.14.3
rancher · Apr 28, 2017 · 6db135a · 6db135a
2 parents 6d70e8c + 4b1026b
commit 6db135a
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 32 deletions.
diff --git a/vendor.conf b/vendor.conf
@@ -17,7 +17,7 @@ github.com/patrickmn/go-cache 1881a9bccb818787f68c52bfba648c6cf34c34fa
 github.com/pkg/errors 1d2e60385a13aaa66134984235061c2f9302520e
 github.com/rancher/go-rancher 939fd85e3c7f06f29e985fd35cb62a281a32d3b0
 github.com/rancher/rancher-catalog-service a3a8b500adceb82b3a0387b2c7b06a60e7eeee9a
-github.com/rancher/rancher-compose-executor v0.14.2
+github.com/rancher/rancher-compose-executor v0.14.3
 github.com/rancher/rancher-docker-api-proxy 461b5e7022698283030495cf5693680699ce9c28
 github.com/Sirupsen/logrus 26709e2714106fb8ad40b773b711ebce25b78914
 github.com/spf13/pflag cb88ea77998c3f024757528e3305022ab50b43be

diff --git a/vendor/github.com/rancher/rancher-compose-executor/config/merge.go b/vendor/github.com/rancher/rancher-compose-executor/config/merge.go
diff --git a/vendor/github.com/rancher/rancher-compose-executor/config/merge_v1.go b/vendor/github.com/rancher/rancher-compose-executor/config/merge_v1.go
diff --git a/vendor/github.com/rancher/rancher-compose-executor/config/merge_v2.go b/vendor/github.com/rancher/rancher-compose-executor/config/merge_v2.go
diff --git a/vendor/github.com/rancher/rancher-compose-executor/rancher/service.go b/vendor/github.com/rancher/rancher-compose-executor/rancher/service.go