Merge pull request #649 from surajnarwade/vendor-update

Updating Vendor for adding compoe v2 extends

glide.lock

@@ -1,5 +1,5 @@
-hash: 2f710a085c1e5b50dc1cde03ab2ead96ad21d5342c743a52daf89d364249ea17
-updated: 2017-06-14T10:23:03.995920576-04:00
+hash: e33ffcc6bb6fbd6496e430ef69139c47d0b4e79c6255c7184d2ec7307d7a55d1
+updated: 2017-06-16T17:40:15.118961307+05:30
 imports:
 - name: cloud.google.com/go
   version: 3b1ae45394a234c385be014e9a488f2bb6eef821
@@ -196,7 +196,7 @@ imports:
 - name: github.com/docker/go-units
   version: 0bbddae09c5a5419a8c6dcdd7ff90da3d450393b
 - name: github.com/docker/libcompose
-  version: 01ff8920a57835fda41607e0f27252408e99cf08
+  version: 4a647d664afbe05c41455c9d534d8239671eb46a
   subpackages:
   - config
   - logger
@@ -496,7 +496,7 @@ imports:
   - jws
   - jwt
 - name: golang.org/x/sys
-  version: 0b25a408a50076fbbcae6b7ac0ea5fbb0b085e79
+  version: fb4cac33e3196ff7f507ab9b2d2a44b0142f5b5a
   subpackages:
   - unix
 - name: golang.org/x/text

glide.yaml

@@ -15,7 +15,7 @@ import:
 
 # We use libcompose to parse v1 and v2 of Docker Compose
 - package: github.com/docker/libcompose
-  version: 01ff8920a57835fda41607e0f27252408e99cf08
+  version: 4a647d664afbe05c41455c9d534d8239671eb46a
   subpackages:
   - config
   - lookup

vendor/github.com/docker/libcompose/config/merge_v2.go

@@ -114,7 +114,7 @@ func parseV2(resourceLookup ResourceLookup, environmentLookup EnvironmentLookup,
 		}
 
 		if options.Validate {
-			if err := validate(baseRawServices); err != nil {
+			if err := validateV2(baseRawServices); err != nil {
 				return nil, err
 			}
 		}