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

Sync with rancher compose
rancher · Dec 1, 2016 · 71f39aa · 71f39aa
2 parents 6e6ebec + c545285
commit 71f39aa
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 12 deletions.
diff --git a/trash.conf b/trash.conf
@@ -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.11.0
+github.com/rancher/rancher-compose v0.12.0-rc1
 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/rancher/lb_service.go b/vendor/github.com/rancher/rancher-compose/rancher/lb_service.go
diff --git a/vendor/github.com/rancher/rancher-compose/rancher/service.go b/vendor/github.com/rancher/rancher-compose/rancher/service.go