Merge branch 'release-1.12.2' into develop

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

.changes/1.12.2.json

@@ -0,0 +1,27 @@
+[
+  {
+    "category": "``mediastore``", 
+    "description": "Update mediastore command to latest version", 
+    "type": "api-change"
+  }, 
+  {
+    "category": "``mediastore-data``", 
+    "description": "Update mediastore-data command to latest version", 
+    "type": "api-change"
+  }, 
+  {
+    "category": "``medialive``", 
+    "description": "Update medialive command to latest version", 
+    "type": "api-change"
+  }, 
+  {
+    "category": "``mediaconvert``", 
+    "description": "Update mediaconvert command to latest version", 
+    "type": "api-change"
+  }, 
+  {
+    "category": "``mediapackage``", 
+    "description": "Update mediapackage command to latest version", 
+    "type": "api-change"
+  }
+]

CHANGELOG.rst

@@ -2,6 +2,16 @@
 CHANGELOG
 =========
 
+1.12.2
+======
+
+* api-change:``mediastore``: Update mediastore command to latest version
+* api-change:``mediastore-data``: Update mediastore-data command to latest version
+* api-change:``medialive``: Update medialive command to latest version
+* api-change:``mediaconvert``: Update mediaconvert command to latest version
+* api-change:``mediapackage``: Update mediapackage command to latest version
+
+
 1.12.1
 ======
 

awscli/__init__.py

@@ -17,7 +17,7 @@
 """
 import os
 
-__version__ = '1.12.1'
+__version__ = '1.12.2'
 
 #
 # 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.12'
 # The full version, including alpha/beta/rc tags.
-release = '1.12.1'
+release = '1.12.2'
 
 # 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.8.1
+        botocore==1.8.2
         colorama>=0.2.5,<=0.3.7
         docutils>=0.10
         rsa>=3.1.2,<=3.5.0

setup.py

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