Merge branch 'release-1.10.49' into develop

* release-1.10.49:
  Bumping version to 1.10.49
  Update changelog based on model updates

.changes/1.10.49.json

@@ -0,0 +1,27 @@
+[
+  {
+    "category": "``cloudformation``", 
+    "description": "Update cloudformation command to latest version", 
+    "type": "feature"
+  }, 
+  {
+    "category": "``elastictranscoder``", 
+    "description": "Update elastictranscoder command to latest version", 
+    "type": "feature"
+  }, 
+  {
+    "category": "``config``", 
+    "description": "Update config command to latest version", 
+    "type": "feature"
+  }, 
+  {
+    "category": "``application-autoscaling``", 
+    "description": "Update application-autoscaling command to latest version", 
+    "type": "feature"
+  }, 
+  {
+    "category": "``acm``", 
+    "description": "Update acm command to latest version", 
+    "type": "feature"
+  }
+]

CHANGELOG.rst

@@ -2,6 +2,16 @@
 CHANGELOG
 =========
 
+1.10.49
+=======
+
+* feature:``cloudformation``: Update cloudformation command to latest version
+* feature:``elastictranscoder``: Update elastictranscoder command to latest version
+* feature:``config``: Update config command to latest version
+* feature:``application-autoscaling``: Update application-autoscaling command to latest version
+* feature:``acm``: Update acm command to latest version
+
+
 1.10.48
 =======
 

awscli/__init__.py

@@ -17,7 +17,7 @@
 """
 import os
 
-__version__ = '1.10.48'
+__version__ = '1.10.49'
 
 #
 # Get our data path to be added to botocore's search path

doc/source/conf.py

@@ -52,7 +52,7 @@
 # The short X.Y version.
 version = '1.10.'
 # The full version, including alpha/beta/rc tags.
-release = '1.10.48'
+release = '1.10.49'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

setup.cfg

@@ -4,7 +4,7 @@ universal = 1
 
 [metadata]
 requires-dist =
-        botocore==1.4.38
+        botocore==1.4.39
         colorama>=0.2.5,<=0.3.7
         docutils>=0.10
         rsa>=3.1.2,<=3.5.0

setup.py

@@ -6,7 +6,7 @@
 import awscli
 
 
-requires = ['botocore==1.4.38',
+requires = ['botocore==1.4.39',
             'colorama>=0.2.5,<=0.3.7',
             'docutils>=0.10',
             'rsa>=3.1.2,<=3.5.0',