From 078208a38ba231e917b8889bdd71949538e4072a Mon Sep 17 00:00:00 2001
From: AWS <aws@amazon.com>
Date: Mon, 5 Dec 2016 16:56:00 -0800
Subject: [PATCH] Bumping version to 1.4.82

---
 .changes/1.4.82.json                                | 12 ++++++++++++
 .changes/next-release/bugfix-Exceptions-99181.json  |  5 -----
 .changes/next-release/feature-opsworkscm-53312.json |  5 -----
 CHANGELOG.rst                                       |  7 +++++++
 botocore/__init__.py                                |  2 +-
 docs/source/conf.py                                 |  2 +-
 6 files changed, 21 insertions(+), 12 deletions(-)
 create mode 100644 .changes/1.4.82.json
 delete mode 100644 .changes/next-release/bugfix-Exceptions-99181.json
 delete mode 100644 .changes/next-release/feature-opsworkscm-53312.json

diff --git a/.changes/1.4.82.json b/.changes/1.4.82.json
new file mode 100644
index 0000000000..522568e1e7
--- /dev/null
+++ b/.changes/1.4.82.json
@@ -0,0 +1,12 @@
+[
+  {
+    "category": "Exceptions", 
+    "description": "Allow parsing of json error responses with non-json bodies.", 
+    "type": "bugfix"
+  }, 
+  {
+    "category": "opsworks-cm", 
+    "description": "Added waiter for Opsworks CM", 
+    "type": "feature"
+  }
+]
\ No newline at end of file
diff --git a/.changes/next-release/bugfix-Exceptions-99181.json b/.changes/next-release/bugfix-Exceptions-99181.json
deleted file mode 100644
index 5ad58d712b..0000000000
--- a/.changes/next-release/bugfix-Exceptions-99181.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "description": "Allow parsing of json error responses with non-json bodies.",
-  "type": "bugfix",
-  "category": "Exceptions"
-}
diff --git a/.changes/next-release/feature-opsworkscm-53312.json b/.changes/next-release/feature-opsworkscm-53312.json
deleted file mode 100644
index 7d4ee3f5c0..0000000000
--- a/.changes/next-release/feature-opsworkscm-53312.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "description": "Added waiter for Opsworks CM",
-  "category": "opsworks-cm",
-  "type": "feature"
-}
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 0cd90f9548..c6644b11da 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,6 +2,13 @@
 CHANGELOG
 =========
 
+1.4.82
+======
+
+* bugfix:Exceptions: Allow parsing of json error responses with non-json bodies.
+* feature:opsworks-cm: Added waiter for Opsworks CM
+
+
 1.4.81
 ======
 
diff --git a/botocore/__init__.py b/botocore/__init__.py
index a28d9e4d49..cbce990a82 100644
--- a/botocore/__init__.py
+++ b/botocore/__init__.py
@@ -16,7 +16,7 @@
 import re
 import logging
 
-__version__ = '1.4.81'
+__version__ = '1.4.82'
 
 
 class NullHandler(logging.Handler):
diff --git a/docs/source/conf.py b/docs/source/conf.py
index 074112c413..45c848c2b0 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -54,7 +54,7 @@
 # The short X.Y version.
 version = '1.4.'
 # The full version, including alpha/beta/rc tags.
-release = '1.4.81'
+release = '1.4.82'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.