From 999c38b09be4a82eb42bad1cbea11517e6767339 Mon Sep 17 00:00:00 2001 From: Jonathan Boulle Date: Sat, 20 Dec 2014 15:31:02 -0800 Subject: [PATCH] Godeps: switch to coreos/yaml --- Godeps/Godeps.json | 10 +++++----- .../yaml.v1 => github.com/coreos/yaml}/LICENSE | 0 .../yaml.v1 => github.com/coreos/yaml}/LICENSE.libyaml | 0 .../yaml.v1 => github.com/coreos/yaml}/README.md | 0 .../yaml.v1 => github.com/coreos/yaml}/apic.go | 0 .../yaml.v1 => github.com/coreos/yaml}/decode.go | 0 .../yaml.v1 => github.com/coreos/yaml}/decode_test.go | 0 .../yaml.v1 => github.com/coreos/yaml}/emitterc.go | 0 .../yaml.v1 => github.com/coreos/yaml}/encode.go | 0 .../yaml.v1 => github.com/coreos/yaml}/encode_test.go | 0 .../yaml.v1 => github.com/coreos/yaml}/parserc.go | 0 .../yaml.v1 => github.com/coreos/yaml}/readerc.go | 0 .../yaml.v1 => github.com/coreos/yaml}/resolve.go | 0 .../yaml.v1 => github.com/coreos/yaml}/scannerc.go | 0 .../yaml.v1 => github.com/coreos/yaml}/sorter.go | 0 .../yaml.v1 => github.com/coreos/yaml}/suite_test.go | 0 .../yaml.v1 => github.com/coreos/yaml}/writerc.go | 0 .../yaml.v1 => github.com/coreos/yaml}/yaml.go | 0 .../yaml.v1 => github.com/coreos/yaml}/yamlh.go | 0 .../yaml.v1 => github.com/coreos/yaml}/yamlprivateh.go | 0 config/config.go | 2 +- config/validate/validate.go | 2 +- 22 files changed, 7 insertions(+), 7 deletions(-) rename Godeps/_workspace/src/{gopkg.in/yaml.v1 => github.com/coreos/yaml}/LICENSE (100%) rename Godeps/_workspace/src/{gopkg.in/yaml.v1 => github.com/coreos/yaml}/LICENSE.libyaml (100%) rename Godeps/_workspace/src/{gopkg.in/yaml.v1 => github.com/coreos/yaml}/README.md (100%) rename Godeps/_workspace/src/{gopkg.in/yaml.v1 => github.com/coreos/yaml}/apic.go (100%) rename Godeps/_workspace/src/{gopkg.in/yaml.v1 => github.com/coreos/yaml}/decode.go (100%) rename Godeps/_workspace/src/{gopkg.in/yaml.v1 => github.com/coreos/yaml}/decode_test.go (100%) rename Godeps/_workspace/src/{gopkg.in/yaml.v1 => github.com/coreos/yaml}/emitterc.go (100%) rename Godeps/_workspace/src/{gopkg.in/yaml.v1 => github.com/coreos/yaml}/encode.go (100%) rename Godeps/_workspace/src/{gopkg.in/yaml.v1 => github.com/coreos/yaml}/encode_test.go (100%) rename Godeps/_workspace/src/{gopkg.in/yaml.v1 => github.com/coreos/yaml}/parserc.go (100%) rename Godeps/_workspace/src/{gopkg.in/yaml.v1 => github.com/coreos/yaml}/readerc.go (100%) rename Godeps/_workspace/src/{gopkg.in/yaml.v1 => github.com/coreos/yaml}/resolve.go (100%) rename Godeps/_workspace/src/{gopkg.in/yaml.v1 => github.com/coreos/yaml}/scannerc.go (100%) rename Godeps/_workspace/src/{gopkg.in/yaml.v1 => github.com/coreos/yaml}/sorter.go (100%) rename Godeps/_workspace/src/{gopkg.in/yaml.v1 => github.com/coreos/yaml}/suite_test.go (100%) rename Godeps/_workspace/src/{gopkg.in/yaml.v1 => github.com/coreos/yaml}/writerc.go (100%) rename Godeps/_workspace/src/{gopkg.in/yaml.v1 => github.com/coreos/yaml}/yaml.go (100%) rename Godeps/_workspace/src/{gopkg.in/yaml.v1 => github.com/coreos/yaml}/yamlh.go (100%) rename Godeps/_workspace/src/{gopkg.in/yaml.v1 => github.com/coreos/yaml}/yamlprivateh.go (100%) diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index 95e4dd1..ee26a08 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -1,6 +1,6 @@ { "ImportPath": "github.com/coreos/coreos-cloudinit", - "GoVersion": "go1.3.1", + "GoVersion": "go1.3.3", "Packages": [ "./..." ], @@ -13,6 +13,10 @@ "ImportPath": "github.com/coreos/go-systemd/dbus", "Rev": "4fbc5060a317b142e6c7bfbedb65596d5f0ab99b" }, + { + "ImportPath": "github.com/coreos/yaml", + "Rev": "9f9df34309c04878acc86042b16630b0f696e1de" + }, { "ImportPath": "github.com/dotcloud/docker/pkg/netlink", "Comment": "v0.11.1-359-g55d41c3e21e1", @@ -25,10 +29,6 @@ { "ImportPath": "github.com/tarm/goserial", "Rev": "cdabc8d44e8e84f58f18074ae44337e1f2f375b9" - }, - { - "ImportPath": "gopkg.in/yaml.v1", - "Rev": "9f9df34309c04878acc86042b16630b0f696e1de" } ] } diff --git a/Godeps/_workspace/src/gopkg.in/yaml.v1/LICENSE b/Godeps/_workspace/src/github.com/coreos/yaml/LICENSE similarity index 100% rename from Godeps/_workspace/src/gopkg.in/yaml.v1/LICENSE rename to Godeps/_workspace/src/github.com/coreos/yaml/LICENSE diff --git a/Godeps/_workspace/src/gopkg.in/yaml.v1/LICENSE.libyaml b/Godeps/_workspace/src/github.com/coreos/yaml/LICENSE.libyaml similarity index 100% rename from Godeps/_workspace/src/gopkg.in/yaml.v1/LICENSE.libyaml rename to Godeps/_workspace/src/github.com/coreos/yaml/LICENSE.libyaml diff --git a/Godeps/_workspace/src/gopkg.in/yaml.v1/README.md b/Godeps/_workspace/src/github.com/coreos/yaml/README.md similarity index 100% rename from Godeps/_workspace/src/gopkg.in/yaml.v1/README.md rename to Godeps/_workspace/src/github.com/coreos/yaml/README.md diff --git a/Godeps/_workspace/src/gopkg.in/yaml.v1/apic.go b/Godeps/_workspace/src/github.com/coreos/yaml/apic.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/yaml.v1/apic.go rename to Godeps/_workspace/src/github.com/coreos/yaml/apic.go diff --git a/Godeps/_workspace/src/gopkg.in/yaml.v1/decode.go b/Godeps/_workspace/src/github.com/coreos/yaml/decode.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/yaml.v1/decode.go rename to Godeps/_workspace/src/github.com/coreos/yaml/decode.go diff --git a/Godeps/_workspace/src/gopkg.in/yaml.v1/decode_test.go b/Godeps/_workspace/src/github.com/coreos/yaml/decode_test.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/yaml.v1/decode_test.go rename to Godeps/_workspace/src/github.com/coreos/yaml/decode_test.go diff --git a/Godeps/_workspace/src/gopkg.in/yaml.v1/emitterc.go b/Godeps/_workspace/src/github.com/coreos/yaml/emitterc.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/yaml.v1/emitterc.go rename to Godeps/_workspace/src/github.com/coreos/yaml/emitterc.go diff --git a/Godeps/_workspace/src/gopkg.in/yaml.v1/encode.go b/Godeps/_workspace/src/github.com/coreos/yaml/encode.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/yaml.v1/encode.go rename to Godeps/_workspace/src/github.com/coreos/yaml/encode.go diff --git a/Godeps/_workspace/src/gopkg.in/yaml.v1/encode_test.go b/Godeps/_workspace/src/github.com/coreos/yaml/encode_test.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/yaml.v1/encode_test.go rename to Godeps/_workspace/src/github.com/coreos/yaml/encode_test.go diff --git a/Godeps/_workspace/src/gopkg.in/yaml.v1/parserc.go b/Godeps/_workspace/src/github.com/coreos/yaml/parserc.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/yaml.v1/parserc.go rename to Godeps/_workspace/src/github.com/coreos/yaml/parserc.go diff --git a/Godeps/_workspace/src/gopkg.in/yaml.v1/readerc.go b/Godeps/_workspace/src/github.com/coreos/yaml/readerc.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/yaml.v1/readerc.go rename to Godeps/_workspace/src/github.com/coreos/yaml/readerc.go diff --git a/Godeps/_workspace/src/gopkg.in/yaml.v1/resolve.go b/Godeps/_workspace/src/github.com/coreos/yaml/resolve.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/yaml.v1/resolve.go rename to Godeps/_workspace/src/github.com/coreos/yaml/resolve.go diff --git a/Godeps/_workspace/src/gopkg.in/yaml.v1/scannerc.go b/Godeps/_workspace/src/github.com/coreos/yaml/scannerc.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/yaml.v1/scannerc.go rename to Godeps/_workspace/src/github.com/coreos/yaml/scannerc.go diff --git a/Godeps/_workspace/src/gopkg.in/yaml.v1/sorter.go b/Godeps/_workspace/src/github.com/coreos/yaml/sorter.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/yaml.v1/sorter.go rename to Godeps/_workspace/src/github.com/coreos/yaml/sorter.go diff --git a/Godeps/_workspace/src/gopkg.in/yaml.v1/suite_test.go b/Godeps/_workspace/src/github.com/coreos/yaml/suite_test.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/yaml.v1/suite_test.go rename to Godeps/_workspace/src/github.com/coreos/yaml/suite_test.go diff --git a/Godeps/_workspace/src/gopkg.in/yaml.v1/writerc.go b/Godeps/_workspace/src/github.com/coreos/yaml/writerc.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/yaml.v1/writerc.go rename to Godeps/_workspace/src/github.com/coreos/yaml/writerc.go diff --git a/Godeps/_workspace/src/gopkg.in/yaml.v1/yaml.go b/Godeps/_workspace/src/github.com/coreos/yaml/yaml.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/yaml.v1/yaml.go rename to Godeps/_workspace/src/github.com/coreos/yaml/yaml.go diff --git a/Godeps/_workspace/src/gopkg.in/yaml.v1/yamlh.go b/Godeps/_workspace/src/github.com/coreos/yaml/yamlh.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/yaml.v1/yamlh.go rename to Godeps/_workspace/src/github.com/coreos/yaml/yamlh.go diff --git a/Godeps/_workspace/src/gopkg.in/yaml.v1/yamlprivateh.go b/Godeps/_workspace/src/github.com/coreos/yaml/yamlprivateh.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/yaml.v1/yamlprivateh.go rename to Godeps/_workspace/src/github.com/coreos/yaml/yamlprivateh.go diff --git a/config/config.go b/config/config.go index 5a3e751..9278ecc 100644 --- a/config/config.go +++ b/config/config.go @@ -21,7 +21,7 @@ import ( "reflect" "strings" - "github.com/coreos/coreos-cloudinit/Godeps/_workspace/src/gopkg.in/yaml.v1" + "github.com/coreos/coreos-cloudinit/Godeps/_workspace/src/github.com/coreos/yaml" ) // CloudConfig encapsulates the entire cloud-config configuration file and maps diff --git a/config/validate/validate.go b/config/validate/validate.go index a5c078c..26ad0b5 100644 --- a/config/validate/validate.go +++ b/config/validate/validate.go @@ -25,7 +25,7 @@ import ( "github.com/coreos/coreos-cloudinit/config" - "github.com/coreos/coreos-cloudinit/Godeps/_workspace/src/gopkg.in/yaml.v1" + "github.com/coreos/coreos-cloudinit/Godeps/_workspace/src/github.com/coreos/yaml" ) var (