Merge branch 'release-1.4.36'

* release-1.4.36: Bumping version to 1.4.36 Update to latest models
boto · Jul 7, 2016 · 7a9d2c6 · 7a9d2c6
2 parents 8dd8a31 + 8a9433f
commit 7a9d2c6
Show file tree

Hide file tree

Showing 8 changed files with 1,542 additions and 84 deletions.
diff --git a/.changes/1.4.36.json b/.changes/1.4.36.json
@@ -0,0 +1,22 @@
+[
+  {
+    "category": "``servicecatalog``", 
+    "description": "Update servicecatalog client to latest version", 
+    "type": "feature"
+  }, 
+  {
+    "category": "``opsworks``", 
+    "description": "Update opsworks client to latest version", 
+    "type": "feature"
+  }, 
+  {
+    "category": "``ds``", 
+    "description": "Update ds client to latest version", 
+    "type": "feature"
+  }, 
+  {
+    "category": "``config``", 
+    "description": "Update config client to latest version", 
+    "type": "feature"
+  }
+]
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -2,6 +2,15 @@
 CHANGELOG
 =========
 
+1.4.36
+======
+
+* feature:``servicecatalog``: Update servicecatalog client to latest version
+* feature:``opsworks``: Update opsworks client to latest version
+* feature:``ds``: Update ds client to latest version
+* feature:``config``: Update config client to latest version
+
+
 1.4.35
 ======
 

diff --git a/botocore/__init__.py b/botocore/__init__.py
@@ -16,7 +16,7 @@
 import re
 import logging
 
-__version__ = '1.4.35'
+__version__ = '1.4.36'
 
 
 class NullHandler(logging.Handler):

diff --git a/botocore/data/config/2014-11-12/service-2.json b/botocore/data/config/2014-11-12/service-2.json
diff --git a/botocore/data/ds/2015-04-16/service-2.json b/botocore/data/ds/2015-04-16/service-2.json
diff --git a/botocore/data/opsworks/2013-02-18/service-2.json b/botocore/data/opsworks/2013-02-18/service-2.json