From 47a7f42172c136b8beeb64e775c8da4d68a91373 Mon Sep 17 00:00:00 2001 From: Marc Limotte Date: Tue, 7 Aug 2012 15:04:00 -0400 Subject: [PATCH 1/2] 1.1.1 bug fix for ami-version --- CHANGES.txt | 5 +++++ project.clj | 2 +- src/main/clj/lemur/command_line.clj | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index 419fbcd..caa4af6 100644 --- 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 probject specifc base file. + 1.1.0 - fire! accepts a "fn of eopts" which returns the cluster diff --git a/project.clj b/project.clj index bb31b78..d138e5e 100644 --- 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 index ab1edff..fbf2b50 100644 --- 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 " - "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")] From 4727e37109bf0543382b08bed32be3a3afcf6e23 Mon Sep 17 00:00:00 2001 From: Marc Limotte Date: Tue, 7 Aug 2012 15:14:34 -0400 Subject: [PATCH 2/2] typos --- CHANGES.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES.txt b/CHANGES.txt index caa4af6..e96f75d 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -3,7 +3,7 @@ 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 probject specifc base file. + otherwise it is not overridable in a project specific base file. 1.1.0