diff options
| author | James Saryerwinnie <js@jamesls.com> | 2013-04-18 04:14:08 -0700 |
|---|---|---|
| committer | James Saryerwinnie <js@jamesls.com> | 2013-04-18 04:14:08 -0700 |
| commit | 89f4947000587e12042e5b35c4557871b21137b9 (patch) | |
| tree | 0606c64058f8402e74b29c621105b74292ff366c /boto/datapipeline/layer1.py | |
| parent | b5852b0aa5ac91f462b28ac9decee33d872dec4d (diff) | |
| parent | 699d861f453aff8a398f9cd5a8de91ec8e36a8cf (diff) | |
| download | boto-2.9.0.tar.gz | |
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
...
Diffstat (limited to 'boto/datapipeline/layer1.py')
| -rw-r--r-- | boto/datapipeline/layer1.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/boto/datapipeline/layer1.py b/boto/datapipeline/layer1.py index 9dc87ecb..1c9a789c 100644 --- a/boto/datapipeline/layer1.py +++ b/boto/datapipeline/layer1.py @@ -20,8 +20,8 @@ # IN THE SOFTWARE. # -import json import boto +from boto.compat import json from boto.connection import AWSQueryConnection from boto.regioninfo import RegionInfo from boto.exception import JSONResponseError |