Commit Graph

368 Commits

Author SHA1 Message Date
Daniel Tralamazza f5a72bc382 Update CHANGELOG.md 2013-09-27 17:03:47 +02:00
Daniel Tralamazza a983a3d904 Merge branch 'master' of github.com:mitchellh/vagrant-aws 2013-09-27 16:48:04 +02:00
Daniel Tralamazza ad977ad645 bump fog.io to 1.15.0 2013-09-27 16:47:51 +02:00
Daniel Tralamazza dd17f23571 replace timed_provision for builtin 2013-09-27 16:47:22 +02:00
Daniel Tralamazza 29c313184a Update CHANGELOG.md 2013-09-27 06:25:21 +02:00
Daniel Tralamazza d87df07747 warn user if no security group has ssh port open
move useless code out of the begin/rescue block
2013-09-27 06:12:53 +02:00
Daniel Tralamazza c2f6daf35a Merge branch 'master' of github.com:mitchellh/vagrant-aws 2013-09-27 04:20:14 +02:00
Daniel Tralamazza 408c901165 ocding alignment 2013-09-27 03:59:03 +02:00
Daniel Tralamazza ee9e0543fd rsync respects .gitignore filters 2013-09-27 02:36:31 +02:00
Daniel Tralamazza 256595780e trailing nightmares 2013-09-27 02:00:02 +02:00
Daniel Tralamazza 92da0a8f91 fancy badges totally stolen from vagrant-proxyconf 2013-09-23 13:31:27 +02:00
Daniel Tralamazza 2b3245eb26 fix goal state condition 2013-09-23 01:25:44 +02:00
Daniel Tralamazza 29ec1a4037 Update CHANGELOG.md 2013-09-23 01:17:25 +02:00
Daniel Tralamazza e1ccb3d8b4 implement reload 2013-09-23 01:10:21 +02:00
Daniel Tralamazza d4f3013d71 Merge branch 'issue_12' of https://github.com/tralamazza/vagrant-aws into tralamazza-issue_12
Conflicts:
	lib/vagrant-aws/action.rb
2013-09-22 23:29:01 +02:00
Daniel Tralamazza 7690b5e7e2 Merge pull request #134 from madhurranjan/issue133
Issue 133 - Terminating the instance and raising an error when elastic i...
2013-09-21 15:35:24 -07:00
Daniel Tralamazza 6e9e14478f closes #135 2013-09-04 12:35:13 +02:00
Madhurranjan Mohaan fed585c8da Issue 133 - Terminating the instance and raising an error when elastic ip cannot be assigned 2013-09-02 23:20:00 +05:30
Daniel Tralamazza 39dbfbd425 dev version 2013-09-02 19:04:43 +02:00
Daniel Tralamazza 205784a166 release 0.3.0 2013-09-02 18:58:21 +02:00
Daniel Tralamazza d050ad6f3e Update CHANGELOG.md
PR #131
2013-09-02 18:51:46 +02:00
Daniel Tralamazza 75e5052e21 Merge pull request #131 from madhurranjan/madhurranjan_commits
Fixing issue with instanceInitiatedShutdownBehavior when ami root_device...
2013-09-02 09:41:04 -07:00
Madhurranjan Mohaan d707677deb Modified according to comments by tralamazza 2013-09-02 22:08:56 +05:30
Daniel Tralamazza 6ae3e067d9 closes #132 2013-09-02 11:00:59 +02:00
Madhurranjan Mohaan 34fe5d1993 Removed unnecessary comments 2013-09-01 21:21:42 +05:30
Madhurranjan Mohaan a5731b67a1 Replaced shutdown_behavior(string) with terminate_on_shutdown(bool) 2013-09-01 21:18:26 +05:30
Mitchell Hashimoto 8b84657e4e s/unless/if !/
/cc @tralamazza - style, I find unless needlessly confusing.
2013-08-31 15:44:22 -07:00
Mitchell Hashimoto 4cb0dd4996 && not and
/cc @tralamazza - I prefer these as a point of style but also "and"
can end up biting you in the ass due to precedence rules.
2013-08-31 15:42:01 -07:00
Madhurranjan Mohaan 894993eaee Fixing issue with instanceInitiatedShutdownBehavior when ami root_device_type is instance-store 2013-09-01 00:44:30 +05:30
Daniel Tralamazza af3f15255d Update CHANGELOG.md
#125
2013-08-30 15:46:05 +02:00
Daniel Tralamazza 255f65de1b closes #125 implements shutdown_behavior 2013-08-30 15:36:16 +02:00
Daniel Tralamazza 8d2d8ebce7 Merge branch 'master' of github.com:mitchellh/vagrant-aws 2013-08-29 19:34:34 +02:00
Daniel Tralamazza 5853ebecc0 catch leaked Excon errors from Fog 2013-08-29 19:34:25 +02:00
Daniel Tralamazza 1d592fc3ff Update CHANGELOG.md
PR #68
2013-08-29 13:07:53 +02:00
Daniel Tralamazza b0769a3706 Merge branch 'jonathanq-iam-instance-profile' 2013-08-29 13:06:11 +02:00
Daniel Tralamazza 4f608f94de Merge branch 'iam-instance-profile' of github.com:jonathanq/vagrant-aws into jonathanq-iam-instance-profile
Conflicts:
	lib/vagrant-aws/action/run_instance.rb
	lib/vagrant-aws/config.rb
	spec/vagrant-aws/config_spec.rb
2013-08-29 12:53:39 +02:00
Daniel Tralamazza ab8fe7c82d Update CHANGELOG.md
PR #17
2013-08-29 12:43:49 +02:00
Daniel Tralamazza 39bcb5d9fb create folder only if option :create is set 2013-08-29 12:41:10 +02:00
Daniel Tralamazza ccc7136a2c Merge branch 'syncfolders_no_host_dir' of github.com:chooper/vagrant-aws into chooper-syncfolders_no_host_dir 2013-08-29 12:29:13 +02:00
Daniel Tralamazza 1b10e86f88 OCD 2013-08-29 05:15:32 +02:00
Daniel Tralamazza 80c93e8cd4 Update CHANGELOG.md
PR #65
2013-08-29 05:09:31 +02:00
Daniel Tralamazza 93f414355a Merge pull request #65 from bwhaley/master
Elastic IP for VPC instances per issue 18
2013-08-28 20:08:15 -07:00
Daniel Tralamazza 0678df750c update changelog to reflect last merges
update gemfile, plugin requires version 1.2+
2013-08-29 04:07:14 +02:00
Ben Whaley a9f634210a added elastic_ip entry in config spec 2013-08-11 17:40:19 -07:00
Ben Whaley dd0491f1a6 catch up to tip 2013-08-11 17:39:47 -07:00
Daniel Tralamazza 4eac781cf9 Merge pull request #73 from panozzaj/master
Add translation for pending messages
2013-08-11 14:30:30 -07:00
Daniel Tralamazza 527d20c6b3 Merge pull request #120 from kkroo/patch-1
README dev section improvement
2013-08-11 14:07:06 -07:00
Daniel Tralamazza a1186d7fc8 Merge pull request #93 from SplunkStorm/block_device_pull_req
Add block_device_mapping support.
2013-08-11 13:23:05 -07:00
Omar Ramadan b2ab2bc1d9 Update README.md 2013-07-23 14:57:11 -07:00
Omar Ramadan c91a67484e Update README.md 2013-07-23 14:54:59 -07:00