Merge branch 'release-0.52.0' into develop

* release-0.52.0: Bumping version to 0.52.0 Upate JSON models to latest version Update dynamodb port to be port 8000
boto · Jun 19, 2014 · aac7783 · aac7783
2 parents 0fd564c + ff7cfac
commit aac7783
Show file tree

Hide file tree

Showing 6 changed files with 1,989 additions and 328 deletions.
diff --git a/botocore/__init__.py b/botocore/__init__.py
@@ -16,7 +16,7 @@
 import re
 import logging
 
-__version__ = '0.51.0'
+__version__ = '0.52.0'
 
 
 class NullHandler(logging.Handler):

diff --git a/botocore/data/aws/elastictranscoder/2012-09-25.json b/botocore/data/aws/elastictranscoder/2012-09-25.json
diff --git a/botocore/data/aws/emr/2009-03-31.json b/botocore/data/aws/emr/2009-03-31.json
diff --git a/services/_endpoints.json b/services/_endpoints.json
@@ -163,7 +163,7 @@
   ],
   "dynamodb": [
     {
-      "uri": "http://localhost:8080",
+      "uri": "http://localhost:8000",
       "constraints": [
         ["region", "equals", "local"]
       ],

diff --git a/services/elastictranscoder.json b/services/elastictranscoder.json
diff --git a/services/emr.json b/services/emr.json