13 commits

Author	SHA1	Message	Date
Andrew Stangl	b885dbdb45	tidy up and remove whitespace	2013-11-20 23:30:01 +00:00
Andrew Stangl	7a365c8094	remove duplicate code introduced during rebase	2013-11-20 23:28:43 +00:00
Andrew Stangl	f4c51682e5	Merge branch 'add_associate_public_ip_address_to_launch_configuration' of github.com:madAndroid/fog into add_associate_public_ip_address_to_launch_configuration	2013-11-20 23:27:03 +00:00
Andrew Stangl	c3b5c3ea2a	add in 'AssociatePublicIpAddress' to launch configuration creation	2013-11-20 23:26:46 +00:00
Andrew Stangl	afc4f19d4b	merge upstream changes and resolve merge conflict	2013-11-20 23:25:48 +00:00
Jon Topper	6aef675688	Remove duplication	2013-11-15 16:55:31 +00:00
Jon Topper	030f8ff77d	Merge branch 'as_config_iam_instance_profile' of github.com:jtopper/fog into as_config_iam_instance_profile ... Conflicts: lib/fog/aws/parsers/auto_scaling/describe_launch_configurations.rb	2013-11-15 16:52:11 +00:00
Jon Topper	24027d8e71	Add IAMInstanceProfile support to launch configs	2013-11-15 16:51:25 +00:00
Jon Topper	f3527c60bb	Merge remote-tracking branch 'upstream/master' ... Conflicts: lib/fog/aws/parsers/auto_scaling/describe_launch_configurations.rb	2013-11-15 16:37:48 +00:00
Andrew Stangl	b2c8a16fca	add in 'AssociatePublicIpAddress' to launch configuration creation	2013-11-15 13:49:55 +00:00
Jon Topper	853069c4e2	Add IAMInstanceProfile support to launch configs	2013-11-14 11:37:16 +00:00
Rodrigo Estebanez	2265bf76b2	adding spot price to launch configurations	2013-11-14 11:29:15 +01:00
Nick Osborn	9afb8c8460	[aws|auto_scaling] implement 2010-08-01 API	2011-06-12 21:07:42 +01:00