diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index d4dcebbff70..5f2d0bc4c10 100644 --- 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" }, { diff --git a/Godeps/_workspace/src/github.com/ghodss/yaml/yaml.go b/Godeps/_workspace/src/github.com/ghodss/yaml/yaml.go index feab2265e17..2afda472e67 100644 --- 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 diff --git a/Godeps/_workspace/src/gopkg.in/v2/yaml/LICENSE b/Godeps/_workspace/src/gopkg.in/yaml.v2/LICENSE similarity index 100% rename from Godeps/_workspace/src/gopkg.in/v2/yaml/LICENSE rename to Godeps/_workspace/src/gopkg.in/yaml.v2/LICENSE diff --git a/Godeps/_workspace/src/gopkg.in/v2/yaml/LICENSE.libyaml b/Godeps/_workspace/src/gopkg.in/yaml.v2/LICENSE.libyaml similarity index 100% rename from Godeps/_workspace/src/gopkg.in/v2/yaml/LICENSE.libyaml rename to Godeps/_workspace/src/gopkg.in/yaml.v2/LICENSE.libyaml diff --git a/Godeps/_workspace/src/gopkg.in/v2/yaml/README.md b/Godeps/_workspace/src/gopkg.in/yaml.v2/README.md similarity index 100% rename from Godeps/_workspace/src/gopkg.in/v2/yaml/README.md rename to Godeps/_workspace/src/gopkg.in/yaml.v2/README.md diff --git a/Godeps/_workspace/src/gopkg.in/v2/yaml/apic.go b/Godeps/_workspace/src/gopkg.in/yaml.v2/apic.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/v2/yaml/apic.go rename to Godeps/_workspace/src/gopkg.in/yaml.v2/apic.go diff --git a/Godeps/_workspace/src/gopkg.in/v2/yaml/decode.go b/Godeps/_workspace/src/gopkg.in/yaml.v2/decode.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/v2/yaml/decode.go rename to Godeps/_workspace/src/gopkg.in/yaml.v2/decode.go diff --git a/Godeps/_workspace/src/gopkg.in/v2/yaml/decode_test.go b/Godeps/_workspace/src/gopkg.in/yaml.v2/decode_test.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/v2/yaml/decode_test.go rename to Godeps/_workspace/src/gopkg.in/yaml.v2/decode_test.go diff --git a/Godeps/_workspace/src/gopkg.in/v2/yaml/emitterc.go b/Godeps/_workspace/src/gopkg.in/yaml.v2/emitterc.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/v2/yaml/emitterc.go rename to Godeps/_workspace/src/gopkg.in/yaml.v2/emitterc.go diff --git a/Godeps/_workspace/src/gopkg.in/v2/yaml/encode.go b/Godeps/_workspace/src/gopkg.in/yaml.v2/encode.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/v2/yaml/encode.go rename to Godeps/_workspace/src/gopkg.in/yaml.v2/encode.go diff --git a/Godeps/_workspace/src/gopkg.in/v2/yaml/encode_test.go b/Godeps/_workspace/src/gopkg.in/yaml.v2/encode_test.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/v2/yaml/encode_test.go rename to Godeps/_workspace/src/gopkg.in/yaml.v2/encode_test.go diff --git a/Godeps/_workspace/src/gopkg.in/v2/yaml/parserc.go b/Godeps/_workspace/src/gopkg.in/yaml.v2/parserc.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/v2/yaml/parserc.go rename to Godeps/_workspace/src/gopkg.in/yaml.v2/parserc.go diff --git a/Godeps/_workspace/src/gopkg.in/v2/yaml/readerc.go b/Godeps/_workspace/src/gopkg.in/yaml.v2/readerc.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/v2/yaml/readerc.go rename to Godeps/_workspace/src/gopkg.in/yaml.v2/readerc.go diff --git a/Godeps/_workspace/src/gopkg.in/v2/yaml/resolve.go b/Godeps/_workspace/src/gopkg.in/yaml.v2/resolve.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/v2/yaml/resolve.go rename to Godeps/_workspace/src/gopkg.in/yaml.v2/resolve.go diff --git a/Godeps/_workspace/src/gopkg.in/v2/yaml/scannerc.go b/Godeps/_workspace/src/gopkg.in/yaml.v2/scannerc.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/v2/yaml/scannerc.go rename to Godeps/_workspace/src/gopkg.in/yaml.v2/scannerc.go diff --git a/Godeps/_workspace/src/gopkg.in/v2/yaml/sorter.go b/Godeps/_workspace/src/gopkg.in/yaml.v2/sorter.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/v2/yaml/sorter.go rename to Godeps/_workspace/src/gopkg.in/yaml.v2/sorter.go diff --git a/Godeps/_workspace/src/gopkg.in/v2/yaml/suite_test.go b/Godeps/_workspace/src/gopkg.in/yaml.v2/suite_test.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/v2/yaml/suite_test.go rename to Godeps/_workspace/src/gopkg.in/yaml.v2/suite_test.go diff --git a/Godeps/_workspace/src/gopkg.in/v2/yaml/writerc.go b/Godeps/_workspace/src/gopkg.in/yaml.v2/writerc.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/v2/yaml/writerc.go rename to Godeps/_workspace/src/gopkg.in/yaml.v2/writerc.go diff --git a/Godeps/_workspace/src/gopkg.in/v2/yaml/yaml.go b/Godeps/_workspace/src/gopkg.in/yaml.v2/yaml.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/v2/yaml/yaml.go rename to Godeps/_workspace/src/gopkg.in/yaml.v2/yaml.go diff --git a/Godeps/_workspace/src/gopkg.in/v2/yaml/yamlh.go b/Godeps/_workspace/src/gopkg.in/yaml.v2/yamlh.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/v2/yaml/yamlh.go rename to Godeps/_workspace/src/gopkg.in/yaml.v2/yamlh.go diff --git a/Godeps/_workspace/src/gopkg.in/v2/yaml/yamlprivateh.go b/Godeps/_workspace/src/gopkg.in/yaml.v2/yamlprivateh.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/v2/yaml/yamlprivateh.go rename to Godeps/_workspace/src/gopkg.in/yaml.v2/yamlprivateh.go diff --git a/pkg/api/validation/schema.go b/pkg/api/validation/schema.go index 57c3e63ffdc..a4cbc0ebdd6 100644 --- 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 {