Skip to content

Commit

Permalink
Merge branch 'release-1.10.46' into develop
Browse files Browse the repository at this point in the history
* release-1.10.46:
  Bumping version to 1.10.46
  Update changelog based on model updates
  • Loading branch information
AWS committed Jul 7, 2016
2 parents 599fb3b + 2360ab2 commit 28f4a8b
Show file tree
Hide file tree
Showing 6 changed files with 35 additions and 4 deletions.
22 changes: 22 additions & 0 deletions .changes/1.10.46.json
@@ -0,0 +1,22 @@
[
{
"category": "``config``",
"description": "Update config command to latest version",
"type": "feature"
},
{
"category": "``ds``",
"description": "Update ds command to latest version",
"type": "feature"
},
{
"category": "``opsworks``",
"description": "Update opsworks command to latest version",
"type": "feature"
},
{
"category": "``servicecatalog``",
"description": "Update servicecatalog command to latest version",
"type": "feature"
}
]
9 changes: 9 additions & 0 deletions CHANGELOG.rst
Expand Up @@ -2,6 +2,15 @@
CHANGELOG
=========

1.10.46
=======

* feature:``config``: Update config command to latest version
* feature:``ds``: Update ds command to latest version
* feature:``opsworks``: Update opsworks command to latest version
* feature:``servicecatalog``: Update servicecatalog command to latest version


1.10.45
=======

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

__version__ = '1.10.45'
__version__ = '1.10.46'

#
# Get our data path to be added to botocore's search path
Expand Down
2 changes: 1 addition & 1 deletion doc/source/conf.py
Expand Up @@ -52,7 +52,7 @@
# The short X.Y version.
version = '1.10.'
# The full version, including alpha/beta/rc tags.
release = '1.10.45'
release = '1.10.46'

# 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
Expand Up @@ -4,7 +4,7 @@ universal = 1

[metadata]
requires-dist =
botocore==1.4.35
botocore==1.4.36
colorama>=0.2.5,<=0.3.3
docutils>=0.10
rsa>=3.1.2,<=3.5.0
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Expand Up @@ -6,7 +6,7 @@
import awscli


requires = ['botocore==1.4.35',
requires = ['botocore==1.4.36',
'colorama>=0.2.5,<=0.3.3',
'docutils>=0.10',
'rsa>=3.1.2,<=3.5.0',
Expand Down

0 comments on commit 28f4a8b

Please sign in to comment.