Skip to content
Browse files

Merge branch 'hotfix-2.5.1'

  • Loading branch information...
2 parents 3478305 + 4df51a7 commit 173478682e779c678f3b4edd69f9953fb59944bd @garnaat garnaat committed Jun 14, 2012
Showing with 4 additions and 4 deletions.
  1. +2 −2 README.rst
  2. +1 −1 boto/__init__.py
  3. +1 −1 boto/provider.py
View
4 README.rst
@@ -1,8 +1,8 @@
####
boto
####
-boto 2.5.0
-13-Jun-2012
+boto 2.5.1
+14-Jun-2012
************
Introduction
View
2 boto/__init__.py
@@ -34,7 +34,7 @@
import urlparse
from boto.exception import InvalidUriError
-__version__ = '2.5.0'
+__version__ = '2.5.1'
Version = __version__ # for backware compatibility
UserAgent = 'Boto/%s (%s)' % (__version__, sys.platform)
View
2 boto/provider.py
@@ -210,7 +210,7 @@ def _populate_keys_from_metadata_server(self):
metadata = get_instance_metadata(timeout=timeout, num_retries=1)
# I'm assuming there's only one role on the instance profile.
if metadata and 'iam' in metadata:
- security = credentials['iam']['security-credentials'].values()[0]
+ security = metadata['iam']['security-credentials'].values()[0]
if self.access_key is None:
self.access_key = security['AccessKeyId']
if self.secret_key is None:

0 comments on commit 1734786

Please sign in to comment.
Something went wrong with that request. Please try again.