Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge remote-tracking branch 'tcc-lemur/master'

Conflicts:
	CHANGES.txt
  • Loading branch information...
commit 5b66f722ee1c85cb6dc1eaeffa6d05757b810cfb 2 parents 5e2495b + a76c7a0
@mlimotte mlimotte authored
View
7 CHANGES.txt
@@ -3,8 +3,13 @@ CHANGES
1.3.0
- Allow explicit action-on-failure setting for defstep
-
- New submit command to add a step to a running jobflow
+- Move to lein2
+
+1.2.1
+
+- set the VisibleToAllUsers flag on all jobflows
+- update to version 1.3.24 of the Amazon SDK for Java
1.2.0
View
4 project.clj
@@ -1,4 +1,4 @@
-(defproject lemur "1.2.0"
+(defproject lemur "1.3.0"
:description "Lemur is a tool to launch hadoop jobs locally or on EMR
based on a configuration file, referred to as a jobdef."
@@ -18,7 +18,7 @@
; aws-java-sdk-1.3.3 does not specify the correct httpclient, so we do it explicitly
[org.apache.httpcomponents/httpclient "4.1.1"]
- [com.amazonaws/aws-java-sdk "1.3.3"
+ [com.amazonaws/aws-java-sdk "1.3.24"
:exclusions [javax.mail/mail org.apache.httpcomponents/httpclient]]
; TODO these two are only to support hipchat-- isolate that functionality, so these libs can be optional
View
5 src/main/clj/com/climate/services/aws/emr.clj
@@ -256,8 +256,8 @@
(let [steps-array (to-array steps)]
(.addJobFlowSteps *emr* (AddJobFlowStepsRequest. jobflow-id steps))))
-(defn start-job-flow [name steps {:keys [log-uri bootstrap-actions ami-version supported-products]
- :or {bootstrap-actions [] supported-products []}
+(defn start-job-flow [name steps {:keys [log-uri bootstrap-actions ami-version supported-products visible-to-all-users]
+ :or {bootstrap-actions [] supported-products [] visible-to-all-users false}
:as all}]
(log/info (str "Starting JobFlow " all))
(let [instances (instances-config all)
@@ -268,6 +268,7 @@
(.setAmiVersion ami-version)
(.setSupportedProducts supported-products)
(.setBootstrapActions bootstrap-actions)
+ (.setVisibleToAllUsers visible-to-all-users)
(.setSteps steps))]
(.getJobFlowId (.runJobFlow *emr* request))))
View
3  src/main/clj/lemur/core.clj
@@ -578,7 +578,8 @@ calls launch - take action (upload files, start cluster, etc)
:keypair (:keypair evaluating-opts)
:ami-version (:ami-version evaluating-opts)
:hadoop-version (:hadoop-version evaluating-opts)
- :supported-products (:supported-products evaluating-opts)}
+ :supported-products (:supported-products evaluating-opts)
+ :visible-to-all-users (true? (:visible-to-all-users evaluating-opts))}
steps
(if (:enable-debugging? evaluating-opts)
(cons (emr/debug-step-config) steps)
Please sign in to comment.
Something went wrong with that request. Please try again.