From 9673dbe12bc26647c5fb0f40938c3fe828c881e8 Mon Sep 17 00:00:00 2001 From: Jonathan Boulle Date: Mon, 30 Jun 2014 22:02:41 -0700 Subject: [PATCH] coreos-cloudinit: fix ordering error in merge invocation --- coreos-cloudinit.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coreos-cloudinit.go b/coreos-cloudinit.go index 31083fe..d30cf9c 100644 --- a/coreos-cloudinit.go +++ b/coreos-cloudinit.go @@ -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")