Merge branch 'upstream'

2015-11-09 08:15:44 +00:00
parent 30aa7a9acc 2f5d8cc188
commit 668f322607
100 changed files with 16891 additions and 347 deletions
--- a/datasource/configdrive/configdrive.go
+++ b/datasource/configdrive/configdrive.go
@@ -16,8 +16,8 @@ package configdrive

 import (
 	"encoding/json"
-	"fmt"
 	"io/ioutil"
+	"log"
 	"os"
 	"path"

@@ -93,7 +93,7 @@ func (cd *configDrive) openstackVersionRoot() string {
 }

 func (cd *configDrive) tryReadFile(filename string) ([]byte, error) {
-	fmt.Printf("Attempting to read from %q\n", filename)
+	log.Printf("Attempting to read from %q\n", filename)
 	data, err := cd.readFile(filename)
 	if os.IsNotExist(err) {
 		err = nil