Merge pull request #90 from mrajashree/update_trash.conf

Update rancher-compose, libcompose and docker libraries in trash.conf

Author: Craig Jellick

model/bindings.go

@@ -62,7 +62,8 @@ func ExtractBindings(yamlContent []byte) (BindingProperty, error) {
 	}
 	rawConfigDocker = config.Services
 
-	rawConfigDocker, err = preprocess.PreprocessServiceMap(rawConfigDocker)
+	preProcessServiceMap := preprocess.PreprocessServiceMap(nil)
+	rawConfigDocker, err = preProcessServiceMap(rawConfigDocker)
 	if err != nil {
 		log.Errorf("Error during preprocess : %v\n", err)
 		return nil, err

trash.conf

@@ -5,18 +5,18 @@ github.com/gorilla/mux e444e69cbd
 github.com/gorilla/websocket 1551221275a7bd42978745a376b2531f791d88f3
 github.com/rancher/go-rancher 37c17e456a2d6dce279f54ee2f957797d30a20dc
 gopkg.in/yaml.v2 49c95bdc21843256fb6c4e0d370a05f24a0bf213
-github.com/docker/libcompose 39b83d07f112b11233ef590658626cbb9e57f3f3 https://github.com/rancher/libcompose/
+github.com/docker/libcompose bdd1f372661dff036f55f1d5ec7c67d04c572285 https://github.com/rancher/libcompose
 github.com/docker/engine-api 62043eb79d581a32ea849645277023c550732e52
 github.com/docker/go-connections 990a1a1a70b0da4c4cb70e117971a4f0babfbf1a
 github.com/cloudfoundry-incubator/candiedyaml 5cef21e2e4f0fd147973b558d4db7395176bcd95
 github.com/xeipuuv/gojsonschema ac452913faa25c08bb78810d3e6f88b8a39f8f25
 github.com/xeipuuv/gojsonreference e02fc20de94c78484cd5ffb007f8af96be030a45
 github.com/xeipuuv/gojsonpointer e0fe6f68307607d540ed8eac07a342c33fa1b54a
 github.com/flynn/go-shlex 3f9db97f856818214da2e1057f8ad84803971cff
-github.com/rancher/rancher-compose 017b29ba81b50a19ba3a35d096182739cec427f0
+github.com/rancher/rancher-compose c623d0cf5f04dc8fe3f1a16f524bd339eef7bcfd
 github.com/awslabs/aws-sdk-go 75d65bc91a02d9f67cf4a5297c46d4d2c4c09c6c
 github.com/docker/distribution 5bbf65499960b184fe8e0f045397375e1a6722b8
-github.com/docker/docker 534753663161334baba06f13b8efa4cad22b5bc5
+github.com/docker/docker b34b29e2379b51edcf45bf9cb70cf1cb4a409608
 github.com/hashicorp/go-version 2b9865f60ce11e527bd1255ba82036d465570aa3
 golang.org/x/net 3a29182c25eeabbaaf94daaeecbc7823d86261e7
 golang.org/x/crypto 4d48e5fa3d62b5e6e71260571bf76c767198ca02
@@ -25,7 +25,6 @@ github.com/vbatts/tar-split v0.9.11
 github.com/vdemeester/docker-events be74d4929ec1ad118df54349fda4b0cba60f849b
 github.com/vaughan0/go-ini a98ad7ee00ec53921f08832bc06ecf7fd600e6a1
 github.com/opencontainers/runc ec01ae5f10516ac73eafb41456365a06f0e21065
-github.com/docker/docker/cliconfig ff3e187cc7a56ce102a61c1a4883f57fb1aed2f7
 github.com/spf13/pflag cb88ea77998c3f024757528e3305022ab50b43be
 github.com/vdemeester/docker-events be74d4929ec1ad118df54349fda4b0cba60f849b
 github.com/spf13/pflag cb88ea77998c3f024757528e3305022ab50b43be