diff options
| author | Mitch Garnaat <mitch@garnaat.com> | 2012-06-14 08:19:30 -0700 |
|---|---|---|
| committer | Mitch Garnaat <mitch@garnaat.com> | 2012-06-14 08:19:30 -0700 |
| commit | 173478682e779c678f3b4edd69f9953fb59944bd (patch) | |
| tree | cdcfc8f4edf3b53da59eaa78bb4cb38b0dc45c5b | |
| parent | 34783053d1f0ce90822664b52bee1a2ca3654cd8 (diff) | |
| parent | 4df51a7e6996ecdf5a6b2d18146289e8f07139b6 (diff) | |
| download | boto-173478682e779c678f3b4edd69f9953fb59944bd.tar.gz | |
Merge branch 'hotfix-2.5.1'2.5.1
| -rw-r--r-- | README.rst | 4 | ||||
| -rw-r--r-- | boto/__init__.py | 2 | ||||
| -rw-r--r-- | boto/provider.py | 2 |
3 files changed, 4 insertions, 4 deletions
@@ -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 index 2bdf04d1..e2687a38 100644 --- a/boto/__init__.py +++ b/boto/__init__.py @@ -34,7 +34,7 @@ import logging.config 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 index 143ee01b..0e903de3 100644 --- a/boto/provider.py +++ b/boto/provider.py @@ -210,7 +210,7 @@ class Provider(object): 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: |