Merge pull request #34 from joshwget/sync-with-rancher-compose

Sync with rancher compose
rancher · Dec 14, 2016 · 9cd9771 · 9cd9771
2 parents 5c74d93 + 44432e4
commit 9cd9771
Show file tree

Hide file tree

Showing 18 changed files with 138 additions and 107 deletions.
diff --git a/trash.conf b/trash.conf
@@ -4,7 +4,7 @@ github.com/docker/distribution 77b9d2997abcded79a5314970fe69a44c93c25fb
 github.com/docker/docker 8658748ef716e43a5f6d834825d818012ed6e2c4
 github.com/docker/go-connections 988efe982fdecb46f01d53465878ff1f2ff411ce
 github.com/docker/go-units f2d77a61e3c169b43402a0a1e84f06daf29b8190
-github.com/docker/libcompose 81ab85ad1c6cbc4395775d9649d4d92994a2e412 https://github.com/rancher/libcompose
+github.com/docker/libcompose 6d5e31da6e294b6d2922434a68e19538038f4243 https://github.com/rancher/libcompose
 github.com/flynn/go-shlex 3f9db97f856818214da2e1057f8ad84803971cff
 github.com/gorilla/context 14f550f51a
 github.com/gorilla/mux e444e69cbd
@@ -17,7 +17,7 @@ github.com/patrickmn/go-cache 1881a9bccb818787f68c52bfba648c6cf34c34fa
 github.com/pkg/errors 1d2e60385a13aaa66134984235061c2f9302520e
 github.com/rancher/go-rancher f4560b58215d7eefc74f867a450ded571b731609
 github.com/rancher/rancher-catalog-service a3a8b500adceb82b3a0387b2c7b06a60e7eeee9a
-github.com/rancher/rancher-compose v0.12.0-rc1
+github.com/rancher/rancher-compose 1a5c2725c1ce1761d8869be5288a797b619fa0bb
 github.com/rancher/rancher-docker-api-proxy 461b5e7022698283030495cf5693680699ce9c28
 github.com/Sirupsen/logrus 26709e2714106fb8ad40b773b711ebce25b78914
 github.com/spf13/pflag cb88ea77998c3f024757528e3305022ab50b43be

diff --git a/vendor/github.com/docker/libcompose/config/interpolation.go b/vendor/github.com/docker/libcompose/config/interpolation.go
diff --git a/vendor/github.com/docker/libcompose/config/merge.go b/vendor/github.com/docker/libcompose/config/merge.go
diff --git a/vendor/github.com/docker/libcompose/config/merge_v1.go b/vendor/github.com/docker/libcompose/config/merge_v1.go
diff --git a/vendor/github.com/docker/libcompose/config/merge_v2.go b/vendor/github.com/docker/libcompose/config/merge_v2.go
diff --git a/vendor/github.com/docker/libcompose/config/types.go b/vendor/github.com/docker/libcompose/config/types.go
diff --git a/vendor/github.com/docker/libcompose/lookup/composable.go b/vendor/github.com/docker/libcompose/lookup/composable.go
diff --git a/vendor/github.com/docker/libcompose/lookup/envfile.go b/vendor/github.com/docker/libcompose/lookup/envfile.go
diff --git a/vendor/github.com/docker/libcompose/lookup/simple_env.go b/vendor/github.com/docker/libcompose/lookup/simple_env.go
diff --git a/vendor/github.com/docker/libcompose/project/project.go b/vendor/github.com/docker/libcompose/project/project.go
diff --git a/vendor/github.com/rancher/rancher-compose/lookup/env.go b/vendor/github.com/rancher/rancher-compose/lookup/env.go
diff --git a/vendor/github.com/rancher/rancher-compose/lookup/map_env.go b/vendor/github.com/rancher/rancher-compose/lookup/map_env.go
diff --git a/vendor/github.com/rancher/rancher-compose/lookup/questions.go b/vendor/github.com/rancher/rancher-compose/lookup/questions.go
diff --git a/vendor/github.com/rancher/rancher-compose/rancher/certs.go b/vendor/github.com/rancher/rancher-compose/rancher/certs.go