Merge branch 'release-0.1.12' into develop

* release-0.1.12: Bumping version to 0.1.12
boto · Nov 29, 2017 · f1c9ea7 · f1c9ea7
2 parents 31b344b + 405f373
commit f1c9ea7
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 6 deletions.
diff --git a/.changes/0.1.12.json b/.changes/0.1.12.json
@@ -0,0 +1,7 @@
+[
+  {
+    "category": "``max_bandwidth``", 
+    "description": "Add ability to set maximum bandwidth consumption for streaming of S3 uploads and downloads", 
+    "type": "enhancement"
+  }
+]
diff --git a/.changes/next-release/enhancement-maxbandwidth-87115.json b/.changes/next-release/enhancement-maxbandwidth-87115.json
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -2,6 +2,12 @@
 CHANGELOG
 =========
 
+0.1.12
+======
+
+* enhancement:``max_bandwidth``: Add ability to set maximum bandwidth consumption for streaming of S3 uploads and downloads
+
+
 0.1.11
 ======
 

diff --git a/s3transfer/__init__.py b/s3transfer/__init__.py
@@ -143,7 +143,7 @@ def __call__(self, bytes_amount):
 
 
 __author__ = 'Amazon Web Services'
-__version__ = '0.1.11'
+__version__ = '0.1.12'
 
 
 class NullHandler(logging.Handler):