Merge pull request #286 from jonboulle/master

Godeps: switch to coreos/yaml
2014-12-20 15:43:55 -08:00 · 2014-12-20 15:43:55 -08:00 · 4e54447b8e
commit 4e54447b8e
parent 06d13de5c3 999c38b09b
22 changed files with 7 additions and 7 deletions
--- 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"
 		}
 	]
 }
--- a/Godeps/_workspace/src/github.com/coreos/yaml/LICENSE
+++ b/Godeps/_workspace/src/github.com/coreos/yaml/LICENSE
--- a/Godeps/_workspace/src/github.com/coreos/yaml/LICENSE.libyaml
+++ b/Godeps/_workspace/src/github.com/coreos/yaml/LICENSE.libyaml
--- a/Godeps/_workspace/src/github.com/coreos/yaml/README.md
+++ b/Godeps/_workspace/src/github.com/coreos/yaml/README.md
--- a/Godeps/_workspace/src/github.com/coreos/yaml/apic.go
+++ b/Godeps/_workspace/src/github.com/coreos/yaml/apic.go
--- a/Godeps/_workspace/src/github.com/coreos/yaml/decode.go
+++ b/Godeps/_workspace/src/github.com/coreos/yaml/decode.go
--- a/Godeps/_workspace/src/github.com/coreos/yaml/decode_test.go
+++ b/Godeps/_workspace/src/github.com/coreos/yaml/decode_test.go
--- a/Godeps/_workspace/src/github.com/coreos/yaml/emitterc.go
+++ b/Godeps/_workspace/src/github.com/coreos/yaml/emitterc.go
--- a/Godeps/_workspace/src/github.com/coreos/yaml/encode.go
+++ b/Godeps/_workspace/src/github.com/coreos/yaml/encode.go
--- a/Godeps/_workspace/src/github.com/coreos/yaml/encode_test.go
+++ b/Godeps/_workspace/src/github.com/coreos/yaml/encode_test.go
--- a/Godeps/_workspace/src/github.com/coreos/yaml/parserc.go
+++ b/Godeps/_workspace/src/github.com/coreos/yaml/parserc.go
--- a/Godeps/_workspace/src/github.com/coreos/yaml/readerc.go
+++ b/Godeps/_workspace/src/github.com/coreos/yaml/readerc.go
--- a/Godeps/_workspace/src/github.com/coreos/yaml/resolve.go
+++ b/Godeps/_workspace/src/github.com/coreos/yaml/resolve.go
--- a/Godeps/_workspace/src/github.com/coreos/yaml/scannerc.go
+++ b/Godeps/_workspace/src/github.com/coreos/yaml/scannerc.go
--- a/Godeps/_workspace/src/github.com/coreos/yaml/sorter.go
+++ b/Godeps/_workspace/src/github.com/coreos/yaml/sorter.go
--- a/Godeps/_workspace/src/github.com/coreos/yaml/suite_test.go
+++ b/Godeps/_workspace/src/github.com/coreos/yaml/suite_test.go
--- a/Godeps/_workspace/src/github.com/coreos/yaml/writerc.go
+++ b/Godeps/_workspace/src/github.com/coreos/yaml/writerc.go
--- a/Godeps/_workspace/src/github.com/coreos/yaml/yaml.go
+++ b/Godeps/_workspace/src/github.com/coreos/yaml/yaml.go
--- a/Godeps/_workspace/src/github.com/coreos/yaml/yamlh.go
+++ b/Godeps/_workspace/src/github.com/coreos/yaml/yamlh.go
--- a/Godeps/_workspace/src/github.com/coreos/yaml/yamlprivateh.go
+++ b/Godeps/_workspace/src/github.com/coreos/yaml/yamlprivateh.go
--- 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
--- 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 (