diff options
| author | Patrick Wendell <pwendell@gmail.com> | 2013-07-31 21:35:12 -0700 |
|---|---|---|
| committer | Patrick Wendell <pwendell@gmail.com> | 2013-07-31 21:35:12 -0700 |
| commit | 5cc725a0e3ef523affae8ff54dd74707e49d64e3 (patch) | |
| tree | ebd1698333d2df4194f17a9ea93a2f2eac2c7acd /ec2/deploy.generic | |
| parent | b7b627d5bb1a1331ea580950834533f84735df4c (diff) | |
| parent | f3cf09491a2b63e19a15e98cf815da503e4fb69b (diff) | |
| download | spark-5cc725a0e3ef523affae8ff54dd74707e49d64e3.tar.gz spark-5cc725a0e3ef523affae8ff54dd74707e49d64e3.tar.bz2 spark-5cc725a0e3ef523affae8ff54dd74707e49d64e3.zip | |
Merge branch 'master' into ec2-updates
Conflicts:
ec2/deploy.generic/root/mesos-ec2/ec2-variables.sh
Diffstat (limited to 'ec2/deploy.generic')
| -rw-r--r-- | ec2/deploy.generic/root/spark-ec2/ec2-variables.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ec2/deploy.generic/root/spark-ec2/ec2-variables.sh b/ec2/deploy.generic/root/spark-ec2/ec2-variables.sh index 5ea0776d08..675429c57e 100644 --- a/ec2/deploy.generic/root/spark-ec2/ec2-variables.sh +++ b/ec2/deploy.generic/root/spark-ec2/ec2-variables.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # These variables are automatically filled in by the spark-ec2 script. export MASTERS="{{master_list}}" |