Skip to content

Commit

Permalink
Merge branch 'release-1.15.26'
Browse files Browse the repository at this point in the history
* release-1.15.26:
  Bumping version to 1.15.26
  Update changelog based on model updates
  • Loading branch information
awstools committed May 22, 2018
2 parents 43b62bf + bd96fd0 commit e6be2bf
Show file tree
Hide file tree
Showing 6 changed files with 23 additions and 4 deletions.
12 changes: 12 additions & 0 deletions .changes/1.15.26.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
[
{
"category": "``ecs``",
"description": "Update ecs command to latest version",
"type": "api-change"
},
{
"category": "``inspector``",
"description": "Update inspector command to latest version",
"type": "api-change"
}
]
7 changes: 7 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,13 @@
CHANGELOG
=========

1.15.26
=======

* api-change:``ecs``: Update ecs command to latest version
* api-change:``inspector``: Update inspector command to latest version


1.15.25
=======

Expand Down
2 changes: 1 addition & 1 deletion awscli/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"""
import os

__version__ = '1.15.25'
__version__ = '1.15.26'

#
# Get our data path to be added to botocore's search path
Expand Down
2 changes: 1 addition & 1 deletion doc/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
# The short X.Y version.
version = '1.15.'
# The full version, including alpha/beta/rc tags.
release = '1.15.25'
release = '1.15.26'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ universal = 1

[metadata]
requires-dist =
botocore==1.10.25
botocore==1.10.26
colorama>=0.2.5,<=0.3.9
docutils>=0.10
rsa>=3.1.2,<=3.5.0
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ def find_version(*file_paths):
raise RuntimeError("Unable to find version string.")


requires = ['botocore==1.10.25',
requires = ['botocore==1.10.26',
'colorama>=0.2.5,<=0.3.9',
'docutils>=0.10',
'rsa>=3.1.2,<=3.5.0',
Expand Down

0 comments on commit e6be2bf

Please sign in to comment.