Merge pull request #3440 from ghodss/upgrade-yaml

Upgrade from gopkg.in/v2/yaml to gopkg.in/yaml.v2 everywhere

Merge pull request #3440 from ghodss/upgrade-yaml
6f1a3acc · Daniel Smith · 55b00573 · 7845ab90 · 6f1a3acc · 6f1a3acc
Commit 6f1a3acc authored Jan 13, 2015 by Daniel Smith
22 changed files
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -109,7 +109,7 @@
 		},
 		{
 			"ImportPath": "github.com/ghodss/yaml",
-			"Rev": "4fb5c728a37b361a1e971a3bb3d785fcc96b6ef5"
+			"Rev": "3bc1590d16074751993dd3b1a76e7a8d1a916a11"
 		},
 		{
 			"ImportPath": "github.com/golang/glog",
@@ -210,7 +210,7 @@
 			"Rev": "cbcac7bb8415db9b6cb4d1ebab1dc9afbd688b97"
 		},
 		{
-			"ImportPath": "gopkg.in/v2/yaml",
+			"ImportPath": "gopkg.in/yaml.v2",
 			"Rev": "d466437aa4adc35830964cffc5b5f262c63ddcb4"
 		},
 		{

--- a/Godeps/_workspace/src/github.com/ghodss/yaml/yaml.go
+++ b/Godeps/_workspace/src/github.com/ghodss/yaml/yaml.go
@@ -7,7 +7,7 @@ import (
 	"reflect"
 	"strconv"

-	"gopkg.in/v2/yaml"
+	"gopkg.in/yaml.v2"
 )

 // Marshals the object into JSON then converts JSON to YAML and returns the

--- a/Godeps/_workspace/src/gopkg.in/v2/yaml/LICENSE
+++ b/Godeps/_workspace/src/gopkg.in/v2/yaml/LICENSE
--- a/Godeps/_workspace/src/gopkg.in/v2/yaml/LICENSE.libyaml
+++ b/Godeps/_workspace/src/gopkg.in/v2/yaml/LICENSE.libyaml
--- a/Godeps/_workspace/src/gopkg.in/v2/yaml/README.md
+++ b/Godeps/_workspace/src/gopkg.in/v2/yaml/README.md
--- a/Godeps/_workspace/src/gopkg.in/v2/yaml/apic.go
+++ b/Godeps/_workspace/src/gopkg.in/v2/yaml/apic.go
--- a/Godeps/_workspace/src/gopkg.in/v2/yaml/decode.go
+++ b/Godeps/_workspace/src/gopkg.in/v2/yaml/decode.go
--- a/Godeps/_workspace/src/gopkg.in/v2/yaml/decode_test.go
+++ b/Godeps/_workspace/src/gopkg.in/v2/yaml/decode_test.go
--- a/Godeps/_workspace/src/gopkg.in/v2/yaml/emitterc.go
+++ b/Godeps/_workspace/src/gopkg.in/v2/yaml/emitterc.go
--- a/Godeps/_workspace/src/gopkg.in/v2/yaml/encode.go
+++ b/Godeps/_workspace/src/gopkg.in/v2/yaml/encode.go
--- a/Godeps/_workspace/src/gopkg.in/v2/yaml/encode_test.go
+++ b/Godeps/_workspace/src/gopkg.in/v2/yaml/encode_test.go
--- a/Godeps/_workspace/src/gopkg.in/v2/yaml/parserc.go
+++ b/Godeps/_workspace/src/gopkg.in/v2/yaml/parserc.go
--- a/Godeps/_workspace/src/gopkg.in/v2/yaml/readerc.go
+++ b/Godeps/_workspace/src/gopkg.in/v2/yaml/readerc.go
--- a/Godeps/_workspace/src/gopkg.in/v2/yaml/resolve.go
+++ b/Godeps/_workspace/src/gopkg.in/v2/yaml/resolve.go
--- a/Godeps/_workspace/src/gopkg.in/v2/yaml/scannerc.go
+++ b/Godeps/_workspace/src/gopkg.in/v2/yaml/scannerc.go
--- a/Godeps/_workspace/src/gopkg.in/v2/yaml/sorter.go
+++ b/Godeps/_workspace/src/gopkg.in/v2/yaml/sorter.go
--- a/Godeps/_workspace/src/gopkg.in/v2/yaml/suite_test.go
+++ b/Godeps/_workspace/src/gopkg.in/v2/yaml/suite_test.go
--- a/Godeps/_workspace/src/gopkg.in/v2/yaml/writerc.go
+++ b/Godeps/_workspace/src/gopkg.in/v2/yaml/writerc.go
--- a/Godeps/_workspace/src/gopkg.in/v2/yaml/yaml.go
+++ b/Godeps/_workspace/src/gopkg.in/v2/yaml/yaml.go
--- a/Godeps/_workspace/src/gopkg.in/v2/yaml/yamlh.go
+++ b/Godeps/_workspace/src/gopkg.in/v2/yaml/yamlh.go
--- a/Godeps/_workspace/src/gopkg.in/v2/yaml/yamlprivateh.go
+++ b/Godeps/_workspace/src/gopkg.in/v2/yaml/yamlprivateh.go
--- a/pkg/api/validation/schema.go
+++ b/pkg/api/validation/schema.go
@@ -24,7 +24,7 @@ import (

 	"github.com/emicklei/go-restful/swagger"
 	"github.com/golang/glog"
-	"gopkg.in/v2/yaml"
+	"gopkg.in/yaml.v2"
 )

 type InvalidTypeError struct {