diff options
| author | Daniel G. Taylor <danielgtaylor@gmail.com> | 2013-12-13 12:46:00 -0800 |
|---|---|---|
| committer | Daniel G. Taylor <danielgtaylor@gmail.com> | 2013-12-13 12:46:00 -0800 |
| commit | b98f85c8dcb5294b6764b87d60acc3344e18a631 (patch) | |
| tree | 9e09f6f1e52b6a2e1ab9379c35b18b172fad10b9 | |
| parent | 29a7fc6a6ce0851b9b85aed34a6c0087bd967482 (diff) | |
| parent | 6ab655755aef7de908e588a9d0e00900ffac57fd (diff) | |
| download | boto-2.20.1.tar.gz | |
Merge branch 'release-2.20.1'2.20.1
| -rw-r--r-- | README.rst | 4 | ||||
| -rw-r--r-- | boto/__init__.py | 2 | ||||
| -rw-r--r-- | boto/provider.py | 2 | ||||
| -rw-r--r-- | docs/source/index.rst | 1 | ||||
| -rw-r--r-- | docs/source/releasenotes/v2.20.1.rst | 11 | ||||
| -rw-r--r-- | tests/unit/provider/test_provider.py | 4 |
6 files changed, 18 insertions, 6 deletions
@@ -1,9 +1,9 @@ #### boto #### -boto 2.20.0 +boto 2.20.1 -Released: 12-December-2013 +Released: 13-December-2013 .. image:: https://travis-ci.org/boto/boto.png?branch=develop :target: https://travis-ci.org/boto/boto diff --git a/boto/__init__.py b/boto/__init__.py index a2b19893..c145cf5d 100644 --- a/boto/__init__.py +++ b/boto/__init__.py @@ -36,7 +36,7 @@ import logging.config import urlparse from boto.exception import InvalidUriError -__version__ = '2.20.0' +__version__ = '2.20.1' Version = __version__ # for backware compatibility UserAgent = 'Boto/%s Python/%s %s/%s' % ( diff --git a/boto/provider.py b/boto/provider.py index e27247cd..6f77faaf 100644 --- a/boto/provider.py +++ b/boto/provider.py @@ -290,7 +290,7 @@ class Provider(object): # clear to users. metadata = get_instance_metadata( timeout=timeout, num_retries=attempts, - data='meta-data/iam/security-credentials') + data='meta-data/iam/security-credentials/') if metadata: # I'm assuming there's only one role on the instance profile. security = metadata.values()[0] diff --git a/docs/source/index.rst b/docs/source/index.rst index c6e7faa0..d61b0a73 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -115,6 +115,7 @@ Release Notes .. toctree:: :titlesonly: + releasenotes/v2.20.1 releasenotes/v2.20.0 releasenotes/v2.19.0 releasenotes/v2.18.0 diff --git a/docs/source/releasenotes/v2.20.1.rst b/docs/source/releasenotes/v2.20.1.rst new file mode 100644 index 00000000..6793d176 --- /dev/null +++ b/docs/source/releasenotes/v2.20.1.rst @@ -0,0 +1,11 @@ +boto v2.20.1 +============ + +:date: 2013/12/13 + +This release fixes an important Amazon EC2 bug related to fetching security credentials via the meta-data service. It is recommended that users of boto-2.20.0 upgrade to boto-2.20.1. + + +Bugfixes +-------- +* Bug fix for IAM security credentials metadata URL. (:issue:`1912`, :issue:`1908`, :issue:`1907`, :sha:`f82e7a5`) diff --git a/tests/unit/provider/test_provider.py b/tests/unit/provider/test_provider.py index cbeea4a9..363f247d 100644 --- a/tests/unit/provider/test_provider.py +++ b/tests/unit/provider/test_provider.py @@ -132,7 +132,7 @@ class TestProvider(unittest.TestCase): self.assertEqual(p.security_token, 'iam_token') self.assertEqual( self.get_instance_metadata.call_args[1]['data'], - 'meta-data/iam/security-credentials') + 'meta-data/iam/security-credentials/') def test_refresh_credentials(self): now = datetime.now() @@ -180,7 +180,7 @@ class TestProvider(unittest.TestCase): self.assertEqual(p.security_token, 'iam_token') self.get_instance_metadata.assert_called_with( timeout=4.0, num_retries=10, - data='meta-data/iam/security-credentials') + data='meta-data/iam/security-credentials/') if __name__ == '__main__': |