Update vendoring as well as libcompose

This commit updates libcompose in order to merge in docker/libcompose#423 which affected kubernetes#92 by not erroring out when an image name wasn't provided. Closes kubernetes#92 As well as knocks out the last required milestone for a 0.2.1 release https://github.com/kubernetes-incubator/kompose/milestone/2
kadel · Jan 20, 2017 · 68e513a · 68e513a
1 parent d59643b
commit 68e513a
Show file tree

Hide file tree

Showing 26 changed files with 640 additions and 429 deletions.
diff --git a/glide.lock b/glide.lock
diff --git a/glide.yaml b/glide.yaml
@@ -11,7 +11,7 @@ import:
 - package: github.com/spf13/viper
 
 - package: github.com/docker/libcompose
-  version: fbdac0a6a80837c63eb6c8f43514f7bb3f32df6c
+  version: 2e320f69cafc70683514ee6226d40e2fe868e6d3
   subpackages:
   - config
   - lookup

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