Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

bugfix for ami-version #11

Merged
merged 2 commits into from

2 participants

@mlimotte
Owner

No description provided.

@bzimmer

specific

Owner

project

@bzimmer bzimmer merged commit d9bf535 into TheClimateCorporation:master
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Aug 7, 2012
  1. @mlimotte
  2. @mlimotte

    typos

    mlimotte authored
This page is out of date. Refresh to see the latest.
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")]
Something went wrong with that request. Please try again.