Merge branch 'release-1.12.1' into develop

* release-1.12.1: Bumping version to 1.12.1 Increase assume role integration test wait times Update changelog based on model updates
aws · Nov 23, 2017 · 9e00471 · 9e00471
2 parents 0f63d3f + 791e900
commit 9e00471
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 10 deletions.
diff --git a/.changes/1.12.1.json b/.changes/1.12.1.json
@@ -0,0 +1,12 @@
+[
+  {
+    "category": "Credentials", 
+    "description": "Fixes a bug causing cached credentials to break in the CLI on Windows. Fixes aws/aws-cli`#2978 <https://github.com/boto/botocore/issues/2978>`__", 
+    "type": "bugfix"
+  }, 
+  {
+    "category": "``acm``", 
+    "description": "Update acm command to latest version", 
+    "type": "api-change"
+  }
+]
diff --git a/.changes/next-release/bugfix-Credentials-62433.json b/.changes/next-release/bugfix-Credentials-62433.json
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -2,6 +2,13 @@
 CHANGELOG
 =========
 
+1.12.1
+======
+
+* bugfix:Credentials: Fixes a bug causing cached credentials to break in the CLI on Windows. Fixes aws/aws-cli`#2978 <https://github.com/boto/botocore/issues/2978>`__
+* api-change:``acm``: Update acm command to latest version
+
+
 1.12.0
 ======
 

diff --git a/awscli/__init__.py b/awscli/__init__.py
@@ -17,7 +17,7 @@
 """
 import os
 
-__version__ = '1.12.0'
+__version__ = '1.12.1'
 
 #
 # Get our data path to be added to botocore's search path

diff --git a/doc/source/conf.py b/doc/source/conf.py
@@ -52,7 +52,7 @@
 # The short X.Y version.
 version = '1.12'
 # The full version, including alpha/beta/rc tags.
-release = '1.12.0'
+release = '1.12.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/setup.cfg b/setup.cfg
@@ -4,7 +4,7 @@ universal = 1
 
 [metadata]
 requires-dist =
-        botocore==1.8.0
+        botocore==1.8.1
         colorama>=0.2.5,<=0.3.7
         docutils>=0.10
         rsa>=3.1.2,<=3.5.0

diff --git a/setup.py b/setup.py
@@ -23,7 +23,7 @@ def find_version(*file_paths):
     raise RuntimeError("Unable to find version string.")
 
 
-requires = ['botocore==1.8.0',
+requires = ['botocore==1.8.1',
             'colorama>=0.2.5,<=0.3.7',
             'docutils>=0.10',
             'rsa>=3.1.2,<=3.5.0',

diff --git a/tests/integration/test_assume_role.py b/tests/integration/test_assume_role.py
@@ -98,7 +98,7 @@ def create_creds(self, user_name):
         return creds
 
     def wait_for_assume_role(self, role_arn, access_key, secret_key,
-                             token=None, attempts=20, delay=5):
+                             token=None, attempts=30, delay=10):
         # "Why not use the policy simulator?" you might ask. The answer is
         # that the policy simulator will return success far before you can
         # actually make the calls.