diff options
| author | Reynold Xin <rxin@cs.berkeley.edu> | 2013-05-15 00:31:52 -0700 |
|---|---|---|
| committer | Reynold Xin <rxin@cs.berkeley.edu> | 2013-05-15 00:31:52 -0700 |
| commit | f3491cb89bcbd8748bedbd2fe6a200ba09d9e3c2 (patch) | |
| tree | 42dd270599a9445998b064a942d5092a62f702d7 /ec2/spark_ec2.py | |
| parent | 9cafacf32ddb9a3f6c5cb774e4fe527225273f16 (diff) | |
| parent | f9d40a5848a2e1eef31ac63cd9221d5b77c1c5a7 (diff) | |
| download | spark-f3491cb89bcbd8748bedbd2fe6a200ba09d9e3c2.tar.gz spark-f3491cb89bcbd8748bedbd2fe6a200ba09d9e3c2.tar.bz2 spark-f3491cb89bcbd8748bedbd2fe6a200ba09d9e3c2.zip | |
Merge branch 'master' of github.com:mesos/spark into shufflemerge
Conflicts:
core/src/main/scala/spark/storage/BlockManager.scala
core/src/test/scala/spark/DistributedSuite.scala
project/SparkBuild.scala
Diffstat (limited to 'ec2/spark_ec2.py')
| -rwxr-xr-x | ec2/spark_ec2.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ec2/spark_ec2.py b/ec2/spark_ec2.py index 9f2daad2b6..7affe6fffc 100755 --- a/ec2/spark_ec2.py +++ b/ec2/spark_ec2.py @@ -103,7 +103,7 @@ def parse_args(): parser.print_help() sys.exit(1) (action, cluster_name) = args - if opts.identity_file == None and action in ['launch', 'login']: + if opts.identity_file == None and action in ['launch', 'login', 'start']: print >> stderr, ("ERROR: The -i or --identity-file argument is " + "required for " + action) sys.exit(1) |