Permalink
Browse files

Merge pull request #15 from troycald/master

AWSAccessKeyId and AWSSecretKey properties flipped in load-credentials
  • Loading branch information...
2 parents eadbe99 + 22525a9 commit 5172f98695f6eaef452e33365d2c52cc77bd1523 @mlimotte mlimotte committed Nov 3, 2012
Showing with 2 additions and 2 deletions.
  1. +2 −2 src/main/clj/com/climate/services/aws/common.clj
@@ -50,8 +50,8 @@
" => " props)
; AWSSecretKey/AWSAccessKeyId -- this is the format used by AWS CloudWatch
; access_key/secret_key -- this format is for the s3cmd .s3cfg file
- {:access_id (or (get props "accessKey") (get props "AWSSecretKey") (get props "access_key"))
- :private_key (or (get props "secretKey") (get props "AWSAccessKeyId") (get props "secret_key"))
+ {:access_id (or (get props "accessKey") (get props "AWSAccessKeyId") (get props "access_key"))
+ :private_key (or (get props "secretKey") (get props "AWSSecretKey") (get props "secret_key"))
:keypair (get props "keypair")})))]
(when result (log/debug "Loaded aws-credentials" result))
result))

0 comments on commit 5172f98

Please sign in to comment.