coreos-cloudinit: bump to 0.8.3

Merge pull request #168 from jonboulle/foo
fix ordering error in mergeCloudConfig
2014-06-30 22:11:15 -07:00 · 2014-06-30 22:08:47 -07:00 · 2014-06-30 22:07:05 -07:00 · 2014-06-30 18:11:14 -07:00
1 changed files with 2 additions and 2 deletions
--- a/coreos-cloudinit.go
+++ b/coreos-cloudinit.go
@@ -14,7 +14,7 @@ import (
 )

 const (
-	version               = "0.8.2"
+	version               = "0.8.3"
 	datasourceInterval    = 100 * time.Millisecond
 	datasourceMaxInterval = 30 * time.Second
 	datasourceTimeout     = 5 * time.Minute
@@ -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")
Author	SHA1	Message	Date
Jonathan Boulle	f3bd5f543e	coreos-cloudinit: bump to 0.8.3	2014-06-30 22:11:15 -07:00
Jonathan Boulle	660feb59b9	Merge pull request #168 from jonboulle/foo fix ordering error in mergeCloudConfig	2014-06-30 22:08:47 -07:00
Jonathan Boulle	9673dbe12b	coreos-cloudinit: fix ordering error in merge invocation	2014-06-30 22:07:05 -07:00
Alex Crawford	2be435dd83	coreos-cloudinit: bump to 0.8.2+git	2014-06-30 18:11:14 -07:00