Skip to content
Browse files

Merge pull request #11 from mlimotte/master

bugfix for ami-version
  • Loading branch information...
2 parents 7b46553 + 4727e37 commit d9bf5354f01be62a98009b955127ef1f7bbe8e70 @bzimmer bzimmer committed Aug 7, 2012
Showing with 8 additions and 3 deletions.
  1. +5 −0 CHANGES.txt
  2. +1 −1 project.clj
  3. +2 −2 src/main/clj/lemur/command_line.clj
View
5 CHANGES.txt
@@ -1,5 +1,10 @@
CHANGES
+1.1.1
+
+ - Bugfix: :ami-version default should only be set in base.clj, not the command line defaults,
+ otherwise it is not overridable in a project specific base file.
+
1.1.0
- fire! accepts a "fn of eopts" which returns the cluster
View
2 project.clj
@@ -1,4 +1,4 @@
-(defproject lemur "1.1.0"
+(defproject lemur "1.1.1"
:description "Lemur is a tool to launch hadoop jobs locally or on EMR
based on a configuration file, referred to as a jobdef."
View
4 src/main/clj/lemur/command_line.clj
@@ -244,8 +244,8 @@
[:slave-instance-type "Instance type for slaves" "m1.large"]
[:availability-zone "Amazon availabilty zone" nil]
[:num-instances "Number of instances (including the master)" "1"]
- [:ami-version (str "Which AMI to use (see RunJobFlowRequest#setAmiVersion in "
- "the AWS Java SDK. ONLY USED IF --version is 6") "latest"]
+ [:ami-version
+ "Which AMI to use (see RunJobFlowRequest#setAmiVersion in the AWS Java SDK)"]
[:spot-task-group
(str "Create a task group w/ spot instances. Value is type,price,num-addl-instances. "
"E.g. m1.xlarge,30%,300")]

0 comments on commit d9bf535

Please sign in to comment.
Something went wrong with that request. Please try again.