Merge branch 'release-1.12.25'

* release-1.12.25: Bumping version to 1.12.25 Update to latest models Fix annoying DeprecationWarning in parsers.py
boto · Oct 16, 2018 · 1b4601c · 1b4601c
2 parents 2e93e64 + 05d9e56
commit 1b4601c
Show file tree

Hide file tree

Showing 8 changed files with 1,858 additions and 101 deletions.
diff --git a/.changes/1.12.25.json b/.changes/1.12.25.json
@@ -0,0 +1,17 @@
+[
+  {
+    "category": "``glue``", 
+    "description": "Update glue client to latest version", 
+    "type": "api-change"
+  }, 
+  {
+    "category": "``lightsail``", 
+    "description": "Update lightsail client to latest version", 
+    "type": "api-change"
+  }, 
+  {
+    "category": "``resource-groups``", 
+    "description": "Update resource-groups client to latest version", 
+    "type": "api-change"
+  }
+]
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -2,6 +2,14 @@
 CHANGELOG
 =========
 
+1.12.25
+=======
+
+* api-change:``glue``: Update glue client to latest version
+* api-change:``lightsail``: Update lightsail client to latest version
+* api-change:``resource-groups``: Update resource-groups client to latest version
+
+
 1.12.24
 =======
 

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

diff --git a/botocore/data/glue/2017-03-31/service-2.json b/botocore/data/glue/2017-03-31/service-2.json