Merge pull request esl#48 from fogfish/master

{ok, ...} | {error, ...} signature to ec2 api
g-andrade · Sep 19, 2013 · aea6f06 · aea6f06
2 parents 60108f1 + 2b199f9
commit aea6f06
Show file tree

Hide file tree

Showing 3 changed files with 818 additions and 393 deletions.
diff --git a/Emakefile b/Emakefile
@@ -0,0 +1,7 @@
+{"src/*", [
+   report, 
+   verbose, 
+   {i, "include"}, 
+   {outdir, "ebin"},
+   debug_info 
+]}.
diff --git a/include/erlcloud_ec2.hrl b/include/erlcloud_ec2.hrl
@@ -25,7 +25,8 @@
           monitoring_enabled=false::boolean(),
           subnet_id::string(),
           disable_api_termination=false::boolean(),
-          instance_initiated_shutdown_behavior::ec2_shutdown_behavior()
+          instance_initiated_shutdown_behavior::ec2_shutdown_behavior(),
+          ebs_optimized = false :: boolean()
          }).
 -record(ec2_image_spec, {
           image_location::string(),