Merge pull request #11 from mlimotte/master

bugfix for ami-version
TheClimateCorporation · Aug 7, 2012 · d9bf535 · d9bf535
2 parents 7b46553 + 4727e37
commit d9bf535
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/CHANGES.txt b/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

diff --git a/project.clj b/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."

diff --git a/src/main/clj/lemur/command_line.clj b/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 "
+   [:ami-version
-                      "the AWS Java SDK.  ONLY USED IF --version is 6") "latest"]
+    "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")]