unistack-org/cloudinit
4
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #168 from jonboulle/foo

Browse Source 
fix ordering error in mergeCloudConfig
This commit is contained in:
Jonathan Boulle 2014-06-30 22:08:47 -07:00
commit 660feb59b9
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
coreos-cloudinit.go
View File

@ -135,7 +135,7 @@ func main() {
var cc *initialize.CloudConfig
if ccm != nil && ccu != nil {
fmt.Println("Merging cloud-config from meta-data and user-data")
merged := mergeCloudConfig(*ccu, *ccm)
merged := mergeCloudConfig(*ccm, *ccu)
cc = &merged
} else if ccm != nil && ccu == nil {
fmt.Println("Processing cloud-config from meta-data")