From b4fb8d9f49d0c4fd99f767ec17b5a8188447fd1a Mon Sep 17 00:00:00 2001
From: James Saryerwinnie <js@jamesls.com>
Date: Thu, 19 Jun 2014 14:23:56 -0700
Subject: [PATCH 1/2] Update changelog with latest changes

---
 CHANGELOG.rst | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index abb9356ac8ff..4b77a0af6025 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -7,6 +7,18 @@ Next Release (TBD)
 
 * feature:``aws configure``: Add support for setting nested attributes
   (`issue 817 <https://github.com/aws/aws-cli/pull/817>`__)
+* bugfix:``aws s3``: Fix issue when uploading large files to newly
+  created buckets in a non-standard region
+  (`issue 634 <https://github.com/aws/aws-cli/issues/634>`__)
+* feature:``aws dynamodb``: Add support for a ``local`` region for
+  dynamodb (``aws dynamodb --region local ...``)
+  (`issue 608 <https://github.com/aws/aws-cli/issues/608>`__)
+* feature:``aws elasticbeanstalk``: Update ``aws elasticbeanstalk``
+  model to the latest version
+* feature:Documentation Examples: Add more documentatoin examples for many
+  AWS CLI commands
+* feature:``aws emr``: Update model to the latest version
+* feature:``aws elastictranscoder:`` Update model to the latest version
 
 
 1.3.17

From 88be85ec62a3f8f90efc196286eedc32dc2bfef1 Mon Sep 17 00:00:00 2001
From: James Saryerwinnie <js@jamesls.com>
Date: Thu, 19 Jun 2014 14:28:06 -0700
Subject: [PATCH 2/2] Bumping version to 1.3.18

---
 CHANGELOG.rst      | 4 ++--
 awscli/__init__.py | 2 +-
 doc/source/conf.py | 2 +-
 setup.py           | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 4b77a0af6025..038034336466 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,8 +2,8 @@
 CHANGELOG
 =========
 
-Next Release (TBD)
-==================
+1.3.18
+======
 
 * feature:``aws configure``: Add support for setting nested attributes
   (`issue 817 <https://github.com/aws/aws-cli/pull/817>`__)
diff --git a/awscli/__init__.py b/awscli/__init__.py
index 2c87ea7a5580..921c0b600bbe 100644
--- a/awscli/__init__.py
+++ b/awscli/__init__.py
@@ -17,7 +17,7 @@
 """
 import os
 
-__version__ = '1.3.17'
+__version__ = '1.3.18'
 
 #
 # Get our data path to be added to botocore's search path
diff --git a/doc/source/conf.py b/doc/source/conf.py
index ef14d722cc5c..e3a7e64a75c7 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -52,7 +52,7 @@
 # The short X.Y version.
 version = '1.3.'
 # The full version, including alpha/beta/rc tags.
-release = '1.3.17'
+release = '1.3.18'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/setup.py b/setup.py
index b94748197c02..3d291eaac8ac 100644
--- a/setup.py
+++ b/setup.py
@@ -6,7 +6,7 @@
 import awscli
 
 
-requires = ['botocore>=0.51.0,<0.52.0',
+requires = ['botocore>=0.52.0,<0.53.0',
             'bcdoc>=0.12.0,<0.13.0',
             'six>=1.1.0',
             'colorama==0.2.5',