Merge branch 'release-1.11.41'

* release-1.11.41: Bumping version to 1.11.41 Update changelog based on model updates
tangaowei · Jan 20, 2017 · b98be36 · b98be36
2 parents fd4b0e4 + 36e1926
commit b98be36
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 4 deletions.
diff --git a/.changes/1.11.41.json b/.changes/1.11.41.json
@@ -0,0 +1,12 @@
+[
+  {
+    "category": "``acm``", 
+    "description": "Update acm command to latest version", 
+    "type": "feature"
+  }, 
+  {
+    "category": "``health``", 
+    "description": "Update health command to latest version", 
+    "type": "feature"
+  }
+]
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -2,6 +2,13 @@
 CHANGELOG
 =========
 
+1.11.41
+=======
+
+* feature:``acm``: Update acm command to latest version
+* feature:``health``: Update health command to latest version
+
+
 1.11.40
 =======
 

diff --git a/awscli/__init__.py b/awscli/__init__.py
@@ -17,7 +17,7 @@
 """
 import os
 
-__version__ = '1.11.40'
+__version__ = '1.11.41'
 
 #
 # 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.11.'
 # The full version, including alpha/beta/rc tags.
-release = '1.11.40'
+release = '1.11.41'
 
 # 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.5.3
+        botocore==1.5.4
         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
@@ -6,7 +6,7 @@
 import awscli
 
 
-requires = ['botocore==1.5.3',
+requires = ['botocore==1.5.4',
             'colorama>=0.2.5,<=0.3.7',
             'docutils>=0.10',
             'rsa>=3.1.2,<=3.5.0',