summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* S3 Configuration options, makes using DreamHost easier.feature/s3-configuration-optionsChris Moyer2013-03-071-2/+5
* Merge branch 'pasc-1322_disable_external_xml_entities' into developJames Saryerwinnie2013-03-073-2/+28
|\
| * Remove trailing spaceJames Saryerwinnie2013-03-071-1/+2
| * Added unit tests for remote entity loading in xml errors (re #1342)Pascal Hakim2013-02-261-0/+14
| * Merge remote-tracking branch 'origin/develop' into 1322_disable_external_xml_...Pascal Hakim2013-02-2536-199/+2270
| |\
| * | Disable loading of external XML entities in BotoServerErrorsPascal Hakim2013-02-202-2/+13
* | | Merge pull request #1352 from joesondow/developJames Saryerwinnie2013-03-061-1/+1
|\ \ \
| * | | Fix typoJoe Sondow2013-02-231-1/+1
| | |/ | |/|
* | | Merge branch 'nathan11g-redirect-headers' into developJames Saryerwinnie2013-03-061-2/+7
|\ \ \
| * | | Pass headers to set_redirectNathan Grigg2013-03-061-2/+7
* | | | Merge branch 'docs-regions' into developJames Saryerwinnie2013-03-068-402/+386
|\ \ \ \ | |/ / / |/| | |
| * | | Update docs with connect_to_region callsJames Saryerwinnie2013-03-068-67/+51
| * | | Convert DynamoDB doc to unix line endingsJames Saryerwinnie2013-03-061-339/+339
|/ / /
* | | One more meta_generation -> metageneration change for consistencyMike Schwartz2013-03-041-1/+1
* | | Merge branch 'master' of git://github.com/maxnoel/boto into maxnoel-masterMitch Garnaat2013-03-013-1/+186
|\ \ \
| * | | Using errno.EEXIST rather than a literal 17 -- more compatibility.Max Noel2013-02-261-2/+3
| * | | Refactored dynamodb_dump/dynamodb_load into their own functions rather than d...Max Noel2013-02-262-34/+34
| * | | Added dynamodb_dump/dynamodb_load to the list of scripts in setup.py.Max Noel2013-02-251-1/+2
| * | | Added utility scripts to dump/load the contents of DynamoDB tables.Max Noel2013-02-252-0/+183
* | | | Renamed boto meta_generation params to metageneration, for consistency with G...Mike Schwartz2013-02-284-30/+30
* | | | Merge pull request #1364 from lotten/gs_bucket_loggingMike Schwartz2013-02-283-6/+71
|\ \ \ \
| * | | | Adds get_logging_config to GS bucket and storage_uri and performsLars Otten2013-02-283-6/+71
|/ / / /
* | | | Merge branch 'sqs-deletion-test' of git://github.com/toastdriven/boto into to...Mitch Garnaat2013-02-273-33/+53
|\ \ \ \
| * | | | Regression test passing, demonstrating ``force_deletion`` no longer has an ef...Daniel Lindsley2013-02-251-32/+31
| * | | | Added a regression test for SQS's delete behavior & updated the docs.Daniel Lindsley2013-02-253-7/+28
| | |/ / | |/| |
* | | | Merge pull request #1358 from itsdawomb/developChris Moyer2013-02-261-55/+47
|\ \ \ \ | |/ / / |/| | |
| * | | CRITICAL FIXNate2013-02-261-55/+47
|/ / /
* | | Added new root certs to cacerts.txt, to provide additional flexibility in the...Mike Schwartz2013-02-231-0/+1564
* | | Fix typo bug in attach_network_interface. Some PEP8 docstring cleanup.Mitch Garnaat2013-02-231-30/+26
* | | Added basic unit tests for boto.exception.BotoServerErrorPascal Hakim2013-02-231-0/+64
* | | Merge pull request #1346 from toastdriven/ignore-venvJames Saryerwinnie2013-02-221-1/+2
|\ \ \ | |/ / |/| |
| * | Ignore the venv directory from the contributing docs.Daniel Lindsley2013-02-211-1/+2
|/ /
* | Merge branch 'develop' of github.com:boto/boto into developMitch Garnaat2013-02-214-4/+37
|\ \
| * \ Merge branch 'ksacry-patch-1' into developJames Saryerwinnie2013-02-212-0/+28
| |\ \
| | * | Add unittest for #1323James Saryerwinnie2013-02-211-0/+20
| | * | Remove trailing whitespaceJames Saryerwinnie2013-02-211-2/+2
| | * | fix file descriptor leakksacry2013-02-141-0/+8
| * | | Merge branch 'ohe-develop' into developJames Saryerwinnie2013-02-212-4/+9
| |\ \ \
| | * | | Add unittest for #1339James Saryerwinnie2013-02-211-1/+2
| | * | | [refs boto/boto#1302] - adds a return value to set_contents_from_filenameOlivier Hervieu2013-02-191-3/+7
* | | | | Merge branch 'patch-3' of git://github.com/g2harris/boto into g2harris-patch-3Mitch Garnaat2013-02-212-0/+4
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Make proxy_ssl used configured timeoutg2harris2012-11-021-0/+2
| * | | | Fix HTTP timeouts for SSL connectionsg2harris2012-11-021-0/+2
* | | | | Merge branch 'develop' of git://github.com/ericsmalling/boto into ericsmallin...Mitch Garnaat2013-02-211-12/+13
|\ \ \ \ \
| * | | | | 1. Removed invalid ".Ebs." from the "NoDevice" parameter.Eric Smalling2013-02-151-12/+13
* | | | | | Add a string monitoring_state attribute to hold the actual value returned fro...Mitch Garnaat2013-02-211-0/+4
* | | | | | Merge branch 'pasc-awsqueryconnection_unit_tests' into developJames Saryerwinnie2013-02-211-0/+206
|\ \ \ \ \ \
| * | | | | | Import json from compat moduleJames Saryerwinnie2013-02-211-2/+2
| * | | | | | Fixed up API version check in AWSQueryConnection testsPascal Hakim2013-02-151-1/+2
| * | | | | | Removed unused import in AWSQueryConnection unit testsPascal Hakim2013-02-131-1/+0