Merge branch 'hotfix-2.5.1'

jorourke · Jun 14, 2012 · 1734786 · 1734786
2 parents 3478305 + 4df51a7
commit 1734786
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/README.rst b/README.rst
@@ -1,8 +1,8 @@
 ####
 boto
 ####
-boto 2.5.0
-13-Jun-2012
+boto 2.5.1
+14-Jun-2012
 
 ************
 Introduction

diff --git a/boto/__init__.py b/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)

diff --git a/boto/provider.py b/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: