Merge branch 'release-1.15.15' into develop

awstools · awstools · commit 9b48845e698c · 2018-05-07T15:22:31.000-07:00
* release-1.15.15:
  Bumping version to 1.15.15
  Update changelog based on model updates
diff --git a/.changes/1.15.15.json b/.changes/1.15.15.json
@@ -0,0 +1,22 @@
+[
+  {
+    "category": "``alexaforbusiness``", 
+    "description": "Update alexaforbusiness command to latest version", 
+    "type": "api-change"
+  }, 
+  {
+    "category": "``budgets``", 
+    "description": "Update budgets command to latest version", 
+    "type": "api-change"
+  }, 
+  {
+    "category": "``es``", 
+    "description": "Update es 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,15 @@
 CHANGELOG
 =========
 
+1.15.15
+=======
+
+* api-change:``alexaforbusiness``: Update alexaforbusiness command to latest version
+* api-change:``budgets``: Update budgets command to latest version
+* api-change:``es``: Update es command to latest version
+* api-change:``s3``: Update s3 command to latest version
+
+
 1.15.14
 =======
 
diff --git a/awscli/__init__.py b/awscli/__init__.py
@@ -17,7 +17,7 @@
 """
 import os
 
-__version__ = '1.15.14'
+__version__ = '1.15.15'
 
 #
 # 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.15.'
 # The full version, including alpha/beta/rc tags.
-release = '1.15.14'
+release = '1.15.15'
 
 # 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.10.14
+        botocore==1.10.15
         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.10.14',
+requires = ['botocore==1.10.15',
             'colorama>=0.2.5,<=0.3.7',
             'docutils>=0.10',
             'rsa>=3.1.2,<=3.5.0',

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`"""`
`18`	`18`	`import os`
`19`	`19`
`20`		`-__version__ = '1.15.14'`
	`20`	`+__version__ = '1.15.15'`
`21`	`21`
`22`	`22`	`#`
`23`	`23`	`# Get our data path to be added to botocore's search path`