Merge branch 'release-1.16.160' into develop

* release-1.16.160: Bumping version to 1.16.160 Update changelog based on model updates
tangaowei · May 16, 2019 · 24afd26 · 24afd26
2 parents 08d22ae + 7c38626
commit 24afd26
Show file tree

Hide file tree

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

diff --git a/awscli/__init__.py b/awscli/__init__.py
@@ -17,7 +17,7 @@
 """
 import os
 
-__version__ = '1.16.159'
+__version__ = '1.16.160'
 
 #
 # 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.16.1'
 # The full version, including alpha/beta/rc tags.
-release = '1.16.159'
+release = '1.16.160'
 
 # 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.12.149
+        botocore==1.12.150
         colorama>=0.2.5,<=0.3.9
         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.12.149',
+requires = ['botocore==1.12.150',
             'colorama>=0.2.5,<=0.3.9',
             'docutils>=0.10',
             'rsa>=3.1.2,<=3.5.0',