unistack-org/cloudinit
3
0
Fork 0
Code Issues1 Pull Requests Packages Projects Releases Wiki Activity

Merge pull request from jonboulle/master

Browse Source 
Godeps: switch to coreos/yaml
This commit is contained in:
Jonathan Boulle 2014-12-20 15:43:55 -08:00
commit 4e54447b8e
22 changed files with 7 additions and 7 deletions

10
Godeps/Godeps.json generated

@ -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"
}
]
}

0
Godeps/_workspace/src/gopkg.in/yaml.v1/LICENSE → Godeps/_workspace/src/github.com/coreos/yaml/LICENSE generated vendored

0
Godeps/_workspace/src/gopkg.in/yaml.v1/LICENSE.libyaml → Godeps/_workspace/src/github.com/coreos/yaml/LICENSE.libyaml generated vendored

0
Godeps/_workspace/src/gopkg.in/yaml.v1/README.md → Godeps/_workspace/src/github.com/coreos/yaml/README.md generated vendored

0
Godeps/_workspace/src/gopkg.in/yaml.v1/apic.go → Godeps/_workspace/src/github.com/coreos/yaml/apic.go generated vendored

0
Godeps/_workspace/src/gopkg.in/yaml.v1/decode.go → Godeps/_workspace/src/github.com/coreos/yaml/decode.go generated vendored

0
Godeps/_workspace/src/gopkg.in/yaml.v1/decode_test.go → Godeps/_workspace/src/github.com/coreos/yaml/decode_test.go generated vendored

0
Godeps/_workspace/src/gopkg.in/yaml.v1/emitterc.go → Godeps/_workspace/src/github.com/coreos/yaml/emitterc.go generated vendored

0
Godeps/_workspace/src/gopkg.in/yaml.v1/encode.go → Godeps/_workspace/src/github.com/coreos/yaml/encode.go generated vendored

0
Godeps/_workspace/src/gopkg.in/yaml.v1/encode_test.go → Godeps/_workspace/src/github.com/coreos/yaml/encode_test.go generated vendored

0
Godeps/_workspace/src/gopkg.in/yaml.v1/parserc.go → Godeps/_workspace/src/github.com/coreos/yaml/parserc.go generated vendored

0
Godeps/_workspace/src/gopkg.in/yaml.v1/readerc.go → Godeps/_workspace/src/github.com/coreos/yaml/readerc.go generated vendored

0
Godeps/_workspace/src/gopkg.in/yaml.v1/resolve.go → Godeps/_workspace/src/github.com/coreos/yaml/resolve.go generated vendored

0
Godeps/_workspace/src/gopkg.in/yaml.v1/scannerc.go → Godeps/_workspace/src/github.com/coreos/yaml/scannerc.go generated vendored

0
Godeps/_workspace/src/gopkg.in/yaml.v1/sorter.go → Godeps/_workspace/src/github.com/coreos/yaml/sorter.go generated vendored

0
Godeps/_workspace/src/gopkg.in/yaml.v1/suite_test.go → Godeps/_workspace/src/github.com/coreos/yaml/suite_test.go generated vendored

0
Godeps/_workspace/src/gopkg.in/yaml.v1/writerc.go → Godeps/_workspace/src/github.com/coreos/yaml/writerc.go generated vendored

0
Godeps/_workspace/src/gopkg.in/yaml.v1/yaml.go → Godeps/_workspace/src/github.com/coreos/yaml/yaml.go generated vendored

0
Godeps/_workspace/src/gopkg.in/yaml.v1/yamlh.go → Godeps/_workspace/src/github.com/coreos/yaml/yamlh.go generated vendored

0
Godeps/_workspace/src/gopkg.in/yaml.v1/yamlprivateh.go → Godeps/_workspace/src/github.com/coreos/yaml/yamlprivateh.go generated vendored

2
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

2
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 (