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/metadata/ec2/metadata.go
+++ b/datasource/metadata/ec2/metadata.go
@@ -18,6 +18,7 @@ import (
 	"bufio"
 	"bytes"
 	"fmt"
+	"log"
 	"net"
 	"strings"

@@ -61,7 +62,7 @@ func (ms metadataService) FetchMetadata() (datasource.Metadata, error) {
 				return metadata, err
 			}
 			metadata.SSHPublicKeys[name] = sshkey
-			fmt.Printf("Found SSH key for %q\n", name)
+			log.Printf("Found SSH key for %q\n", name)
 		}
 	} else if _, ok := err.(pkg.ErrNotFound); !ok {
 		return metadata, err