summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Bumped to 2.21.2!2.21.2Daniel Lindsley2013-12-244-3/+17
* Fixed an inheritance bug in mturk.Daniel Lindsley2013-12-241-1/+1
* Bumped to version 2.21.1!2.21.1Daniel Lindsley2013-12-234-3/+25
* Merge branch 'master' into release-2.21.1Daniel Lindsley2013-12-231-1/+1
|\
| * Merge branch 'release-2.21.0'2.21.0Daniel G. Taylor2013-12-1967-516/+2719
| |\
| * \ Merge branch 'release-2.20.1'2.20.1Daniel G. Taylor2013-12-136-6/+18
| |\ \
| * \ \ Merge branch 'release-2.20.0'2.20.0Daniel G. Taylor2013-12-1241-175/+2313
| |\ \ \
| * \ \ \ Merge branch 'release-2.19.0'2.19.0Daniel G. Taylor2013-11-2710-48/+422
| |\ \ \ \
| * \ \ \ \ Merge branch 'release-2.18.0'2.18.0Daniel G. Taylor2013-11-2228-46/+1148
| |\ \ \ \ \
| * \ \ \ \ \ Merge pull request #1866 from jthigpen/masterDaniel G. Taylor2013-11-211-1/+1
| |\ \ \ \ \ \
| | * | | | | | Fix an variable name mismatch in the documentation for disassociate_network_acl.James Thigpen2013-11-201-1/+1
| |/ / / / / /
| * | | | | | Merge branch 'release-2.17.0'2.17.0Daniel G. Taylor2013-11-1416-99/+1807
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'release-2.16.0'2.16.0Daniel G. Taylor2013-11-0858-295/+4370
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge pull request #1813 from mbarrien/pull-request-snapshotsDaniel G. Taylor2013-10-282-6/+66
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Tests for #1554, remove unneeded compatibility layerMichael Barrientos2013-10-252-6/+59
| | * | | | | | | | Merge remote-tracking branch 'C2Devel/pull-request-snapshots' into pull-reque...Michael Barrientos2013-10-251-6/+13
| | |\ \ \ \ \ \ \ \ | |/ / / / / / / / /
| | * | | | | | | | Synchronize get_all_snapshots() with current version of APIStanislav Ievlev2013-06-131-6/+13
| * | | | | | | | | Merge branch 'release-2.15.0'2.15.0Daniel G. Taylor2013-10-1725-72/+776
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge pull request #1796 from whilp/re-raiseDaniel G. Taylor2013-10-171-2/+2
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Re-raise the last exception in the current scope.Will Maier2013-10-171-2/+2
| |/ / / / / / / / / /
| * | | | | | | | | | Merge branch 'release-2.14.0'Daniel G. Taylor2013-10-0970-334/+1307
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge pull request #1741 from tommorris/patch-1baserock/morphDaniel Lindsley2013-09-211-1/+1
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | typoTom Morris2013-09-201-1/+1
| |/ / / / / / / / / / /
| * | | | | | | | | | | Merge branch 'release-2.13.3'2.13.3Daniel Lindsley2013-09-162-1/+12
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'release-v2.13.2'v2.13.2Daniel Lindsley2013-09-163-19/+18
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'release-v2.13.1'v2.13.1Daniel Lindsley2013-09-1628-45/+689
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'release-2.13.0'2.13.0Daniel Lindsley2013-09-1248-600/+2333
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'release-2.12.0'2.12.0Daniel Lindsley2013-09-0418-386/+1217
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'release-2.11.0'2.11.0Daniel Lindsley2013-08-2962-112/+1395
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'release-2.10.0'2.10.0Daniel Lindsley2013-08-1338-822/+4455
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'release-2.9.9'2.9.9Daniel Lindsley2013-07-2437-241/+1345
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'release-2.9.8'2.9.8Daniel Lindsley2013-07-1829-44/+1508
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'release-2.9.7'2.9.7Daniel Lindsley2013-07-0840-119/+1511
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'release-2.9.6'2.9.6Daniel Lindsley2013-06-1842-86/+806
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #1551 from EnTeQuAk/patch-1Daniel Lindsley2013-06-151-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Fix annoying typo in basic DynamoDB exampleChristopher Grebs2013-06-101-1/+1
| |/ / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | Merge branch 'release-2.9.5'2.9.5Daniel Lindsley2013-05-2822-107/+565
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'release-2.9.4'2.9.4Daniel Lindsley2013-05-2014-42/+177
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'release-2.9.3'2.9.3Daniel Lindsley2013-05-1541-672/+6686
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'hotfix-2.9.2'2.9.2James Saryerwinnie2013-04-303-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | | | | | | Add release notes scriptDaniel G. Taylor2013-12-231-0/+74
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'switch-to-super' into developDaniel Lindsley2013-12-2398-350/+365
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | Missed two spots for use of ``super(…)``.Daniel Lindsley2013-12-232-4/+4
| * | | | | | | | | | | | | | | | | | | | | | | | | | Updated all old-style inheritance calls.Daniel Lindsley2013-12-2398-357/+372
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #1948 from danielgtaylor/jimbrowne-sts-secure-tokenDaniel G. Taylor2013-12-232-2/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Add unit test for STS security_tokenDaniel G. Taylor2013-12-231-0/+12
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Add security_token parameter to STSConnectionJim Browne2013-12-181-2/+4
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #1940 from danielgtaylor/strptime-bugDaniel G. Taylor2013-12-212-1/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix #1898 by doing an initial call to `datetime.strptime`Daniel G. Taylor2013-12-202-1/+21
|/ / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'china-regions' into developDaniel Lindsley2013-12-2019-12/+50
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \