Merge branch 'release-2.9.0'2.9.0

* release-2.9.0: (158 commits)
  Bump version to 2.9.0
  Added underlying DynamoDB v2 support.
  Add redshift to setup.py/docs index
  Updated requests to something more modern.
  Only use 2 metadata service calls to get credentials
  Fix #1146: return response from custom url opener
  Fixed missing import.
  Add metadata_service_num_attempts config option
  Added cleanup for the snapshots created.
  Added support for redshift.
  Let total attempts by 1 + num_retries
  Add more diagnostics to debug logs
  Change GS calls to make_request to always convert to utf-8 bytes.
  Allow kwargs to be passed through to uplaoder
  Remove whitespace, fix long line lengths
  Improve VPC and VPN support
  Added sleeps to allow amazon time to propogate
  Added error handling for out of space during downloads
  Initial integration tests for idempotent subscribe
  Removed dead code from resumable upload handler
  ...

1 files changed, 17 insertions, 16 deletions

diff --git a/boto/elastictranscoder/layer1.py b/boto/elastictranscoder/layer1.py
index e9b50cd1..293c4f04 100644
--- a/boto/elastictranscoder/layer1.py
+++ b/boto/elastictranscoder/layer1.py
@@ -97,12 +97,12 @@ class ElasticTranscoderConnection(AWSAuthConnection):
             which Elastic Transcoder puts the transcoded
             files.
 
-        :type input_name: structure
+        :type input_name: dict
         :param input_name: A section of the request body that provides
             information about the file that is being
             transcoded.
 
-        :type output: structure
+        :type output: dict
         :param output: A section of the request body that provides information
             about the transcoded (target) file.
 
@@ -141,9 +141,10 @@ class ElasticTranscoderConnection(AWSAuthConnection):
         :param role: The IAM Amazon Resource Name (ARN) for the role that you
             want to use to create the pipeline.
 
-        :type notifications: structure
+        :type notifications: dict
         :param notifications: The () topic that you want to notify to report job
             status.
+        
         To receive notifications, you must also subscribe
             to the new topic in the console.
 
@@ -200,15 +201,15 @@ class ElasticTranscoderConnection(AWSAuthConnection):
         :param container: The container type for the output file. This value
             must be `mp4`.
 
-        :type video: structure
+        :type video: dict
         :param video: A section of the request body that specifies the video
             parameters.
 
-        :type audio: structure
+        :type audio: dict
         :param audio: A section of the request body that specifies the audio
             parameters
 
-        :type thumbnails: structure
+        :type thumbnails: dict
         :param thumbnails: A section of the request body that specifies the
             thumbnail parameters, if any.
 
@@ -229,7 +230,7 @@ class ElasticTranscoderConnection(AWSAuthConnection):
     def delete_pipeline(self, id):
         """
         To delete a pipeline, send a DELETE request to the
-        `//pipelines/ [pipelineId] ` resource.
+        `//pipelines/ [pipelineId]` resource.
 
         You can only delete a pipeline that has never been used or
         that is not currently in use (doesn't contain any active
@@ -246,7 +247,7 @@ class ElasticTranscoderConnection(AWSAuthConnection):
     def delete_preset(self, id):
         """
         To delete a preset, send a DELETE request to the `//presets/
-        [presetId] ` resource.
+        [presetId]` resource.
 
         If the preset has been used, you cannot delete it.
 
@@ -262,7 +263,7 @@ class ElasticTranscoderConnection(AWSAuthConnection):
                               page_token=None):
         """
         To get a list of the jobs currently in a pipeline, send a GET
-        request to the `//jobsByPipeline/ [pipelineId] ` resource.
+        request to the `//jobsByPipeline/ [pipelineId]` resource.
 
         Elastic Transcoder returns all of the jobs currently in the
         specified pipeline. The response body contains one element for
@@ -291,12 +292,12 @@ class ElasticTranscoderConnection(AWSAuthConnection):
         if page_token is not None:
             params['PageToken'] = page_token
         return self.make_request('GET', uri, expected_status=200,
-                                 param=params)
+                                 params=params)
 
     def list_jobs_by_status(self, status, ascending=None, page_token=None):
         """
         To get a list of the jobs that have a specified status, send a
-        GET request to the `//jobsByStatus/ [status] ` resource.
+        GET request to the `//jobsByStatus/ [status]` resource.
 
         Elastic Transcoder returns all of the jobs that have the
         specified status. The response body contains one element for
@@ -327,7 +328,7 @@ class ElasticTranscoderConnection(AWSAuthConnection):
         if page_token is not None:
             params['PageToken'] = page_token
         return self.make_request('GET', uri, expected_status=200,
-                                 param=params)
+                                 params=params)
 
     def list_pipelines(self):
         """
@@ -352,7 +353,7 @@ class ElasticTranscoderConnection(AWSAuthConnection):
     def read_job(self, id):
         """
         To get detailed information about a job, send a GET request to
-        the `//jobs/ [jobId] ` resource.
+        the `//jobs/ [jobId]` resource.
 
         :type id: string
         :param id: The identifier of the job for which you want to get detailed
@@ -365,7 +366,7 @@ class ElasticTranscoderConnection(AWSAuthConnection):
     def read_pipeline(self, id):
         """
         To get detailed information about a pipeline, send a GET
-        request to the `//pipelines/ [pipelineId] ` resource.
+        request to the `//pipelines/ [pipelineId]` resource.
 
         :type id: string
         :param id: The identifier of the pipeline to read.
@@ -377,7 +378,7 @@ class ElasticTranscoderConnection(AWSAuthConnection):
     def read_preset(self, id):
         """
         To get detailed information about a preset, send a GET request
-        to the `//presets/ [presetId] ` resource.
+        to the `//presets/ [presetId]` resource.
 
         :type id: string
         :param id: The identifier of the preset for which you want to get
@@ -441,7 +442,7 @@ class ElasticTranscoderConnection(AWSAuthConnection):
         :param id: The identifier of the pipeline for which you want to change
             notification settings.
 
-        :type notifications: structure
+        :type notifications: dict
         :param notifications: The () topic that you want to notify to report job
             status.
         To receive notifications, you must also subscribe