Merge pull request #64 from deniseschannon/rcev1410

rancher-compose-executor v0.14.10
rancher · Jun 21, 2017 · f8693b8 · f8693b8
2 parents 519f4d5 + c8e12dc
commit f8693b8
Show file tree

Hide file tree

Showing 15 changed files with 44 additions and 17 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.9
+github.com/rancher/rancher-compose-executor v0.14.10
 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/convert.go b/vendor/github.com/rancher/rancher-compose-executor/config/convert.go
diff --git a/vendor/github.com/rancher/rancher-compose-executor/config/hash.go b/vendor/github.com/rancher/rancher-compose-executor/config/hash.go
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/types.go b/vendor/github.com/rancher/rancher-compose-executor/config/types.go
diff --git a/vendor/github.com/rancher/rancher-compose-executor/convert/convert.go b/vendor/github.com/rancher/rancher-compose-executor/convert/convert.go
diff --git a/vendor/github.com/rancher/rancher-compose-executor/lookup/simple_env.go b/vendor/github.com/rancher/rancher-compose-executor/lookup/simple_env.go
diff --git a/vendor/github.com/rancher/rancher-compose-executor/rancher/configs.go b/vendor/github.com/rancher/rancher-compose-executor/rancher/configs.go
diff --git a/...ithub.com/docker/libcompose/yaml/build.go → ...er/rancher-compose-executor/yaml/build.go b/...ithub.com/docker/libcompose/yaml/build.go → ...er/rancher-compose-executor/yaml/build.go
diff --git a/...hub.com/docker/libcompose/yaml/command.go → .../rancher-compose-executor/yaml/command.go b/...hub.com/docker/libcompose/yaml/command.go → .../rancher-compose-executor/yaml/command.go
diff --git a/...ub.com/docker/libcompose/yaml/external.go → ...rancher-compose-executor/yaml/external.go b/...ub.com/docker/libcompose/yaml/external.go → ...rancher-compose-executor/yaml/external.go
diff --git a/...hub.com/docker/libcompose/yaml/network.go → .../rancher-compose-executor/yaml/network.go b/...hub.com/docker/libcompose/yaml/network.go → .../rancher-compose-executor/yaml/network.go
diff --git a/....com/docker/libcompose/yaml/types_yaml.go → ...ncher-compose-executor/yaml/types_yaml.go b/....com/docker/libcompose/yaml/types_yaml.go → ...ncher-compose-executor/yaml/types_yaml.go
diff --git a/...thub.com/docker/libcompose/yaml/ulimit.go → ...r/rancher-compose-executor/yaml/ulimit.go b/...thub.com/docker/libcompose/yaml/ulimit.go → ...r/rancher-compose-executor/yaml/ulimit.go
diff --git a/...thub.com/docker/libcompose/yaml/volume.go → ...r/rancher-compose-executor/yaml/volume.go b/...thub.com/docker/libcompose/yaml/volume.go → ...r/rancher-compose-executor/yaml/volume.go