summaryrefslogtreecommitdiff
path: root/boto/ec2
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'release-2.33.0'2.33.0kyleknap2014-10-0839-164/+219
|\
| * Fix ec2 release_address for ``allocation_id``kyleknap2014-10-081-1/+1
| * Merge pull request #2610 from EaterOA/developDaniel G. Taylor2014-10-071-21/+28
| |\
| | * Fixed TaggedEC2Object.remove_tags failing in Python 3Vincent Wong2014-09-131-1/+1
| | * Fixed remove_tags not checking values, fixed testVincent Wong2014-09-131-1/+2
| | * Removed duplicate code in add_tag and remove_tagVincent Wong2014-09-131-19/+2
| | * Added method TaggedEC2Object.remove_tags()Vincent Wong2014-09-131-7/+30
| * | Merge pull request #2602 from zihaoyu/elb_idle_timeoutKyle Knapp2014-10-011-1/+1
| |\ \
| | * | change back to connectingsettingsZihao Yu2014-09-211-1/+1
| | * | add missing bracesZihao Yu2014-09-161-1/+1
| | * | fix typoZihao Yu2014-09-101-1/+1
| | |/
| * | Merge branch 'nishigori-b64encode-launch-config-user-data' into developDaniel G. Taylor2014-09-221-1/+4
| |\ \
| | * | autoscale module: fix launch_config.user_data creation via connectionnishigori2014-09-051-1/+4
| | |/
| * | Merge pull request #2620 from tedder/patch-1Kyle Knapp2014-09-191-2/+2
| |\ \
| | * | fix ELB ConnectionSettings values in documentationTed Timmons2014-09-161-2/+2
| | |/
| * | Fix few typonishigori2014-09-051-2/+2
| |/
| * Support EBS encryption in BlockDeviceType.Joe Crobak2014-09-021-1/+13
| * Fix Listener class's __getitem__ method to return the correct data. Add a tes...nash e. foster2014-08-181-1/+3
| * Merge pull request #2505 from CashStar/eip_eni_associateDaniel G. Taylor2014-08-071-11/+13
| |\
| | * allow private IP be specified when associating with ENInevins-b2014-08-061-1/+3
| | * allowing address to use network_interface_idnevins-b2014-08-061-11/+11
| * | Merge branch 'CashStar-develop' into developDaniel G. Taylor2014-08-062-2/+30
| |\ \
| | * | adding connectionSetting to ELB fullynevins-b2014-08-011-0/+7
| | * | adding ELB connection settings IdleTime attributenevins-b2014-08-011-2/+24
| | |/
| * | Merge pull request #2470 from felixonmars/ec2-tidyDaniel G. Taylor2014-08-0636-127/+128
| |\ \ | | |/ | |/|
| | * ec2 module: tidy up to meet PEP8 betterFelix Yan2014-07-3036-127/+128
* | | Merge branch 'release-2.32.0'2.32.0Daniel G. Taylor2014-07-3013-102/+137
|\ \ \ | |/ /
| * | Merge pull request #2471 from j0nes2k/patch-1Daniel G. Taylor2014-07-301-1/+2
| |\ \
| | * | Updated documentation for copy_imagej0nes2k2014-07-301-1/+2
| | |/
| * | [DOC] Fixed #2464 added keyword "detailed"Ilambharathi Kanniah2014-07-291-5/+5
| |/
| * Fix run_instances network_interfaces arg docoPhilip Jay2014-07-291-3/+3
| * Merge pull request #2433 from kevgliss/elb_markerDaniel G. Taylor2014-07-281-1/+11
| |\
| | * adding marker param to describe all elbsKevin Glisson2014-07-201-1/+11
| * | Add 'include_all_instances' support to 'get_all_instance_status'.Shawn Falkner-Horine2014-07-241-1/+9
| |/
| * ec2 module: add backward-compatible support for Python 3.3+Felix Yan2014-07-181-0/+3
| * Merge pull request #2399 from felixonmars/vpc-py3Daniel G. Taylor2014-07-171-0/+3
| |\
| | * move filters compatibility code to EC2Connection.build_filter_paramsFelix Yan2014-07-181-0/+3
| * | Merge pull request #2396 from phspagiari/userdata_encode_fixDaniel G. Taylor2014-07-162-2/+2
| |\ \
| | * | Fixed #1698 and put unit tests on itPedro H. Spagiari2014-07-112-2/+2
| | |/
| * | Merge tag '2.31.1' into developDaniel G. Taylor2014-07-161-7/+22
| |\ \
| * | | cloudwatch module: add backward-compatible support for Python 3.3+Felix Yan2014-07-135-13/+7
| | |/ | |/|
| * | autoscale module: add backward-compatible support for Python 3.3+Felix Yan2014-07-111-1/+1
| * | Merge pull request #2352 from garnaat/fix-elb-testsDaniel G. Taylor2014-07-072-50/+62
| |\ \
| | * | Fixing ELB unit tests. Also did some PEP8 cleanup on ELB code.Mitch Garnaat2014-07-022-50/+62
| * | | Documentation updates:Rayson Ho2014-07-032-2/+5
| |/ /
| * | Merge branch 'develop' into py2and3Daniel G. Taylor2014-07-021-0/+6
| |\ \
| * | | Remove unnecessary print_function importsDaniel G. Taylor2014-06-272-4/+0
| * | | Initial work to support Python 3.3+Daniel G. Taylor2014-06-278-21/+26
* | | | alarm.py - Fixed typoubhisat2014-07-251-1/+1
| |_|/ |/| |
* | | Merge branch 'release-2.30.0'2.30.0Daniel G. Taylor2014-07-013-2/+98
|\ \ \ | | |/ | |/|