Fix merge problems

2015-04-02 07:26:21 -07:00
parent 2812936d34
commit 89089900d7
5 changed files with 30 additions and 35 deletions
--- a/pkg/cloudprovider/aws/aws.go
+++ b/pkg/cloudprovider/aws/aws.go
@@ -166,7 +166,7 @@ func (s *goamzEC2) DeleteVolume(volumeId string) (resp *ec2.SimpleResp, err erro
 func init() {
 	cloudprovider.RegisterCloudProvider("aws", func(config io.Reader) (cloudprovider.Interface, error) {
 		metadata := &goamzMetadata{}
-		return newAWSCloud(config, getAuth, metadata)
+		return newAWSCloud(config, getAuth, "", metadata)
 	})
 }