diff options
author | Mosharaf Chowdhury <mosharaf@cs.berkeley.edu> | 2012-10-02 22:25:39 -0700 |
---|---|---|
committer | Mosharaf Chowdhury <mosharaf@cs.berkeley.edu> | 2012-10-02 22:25:39 -0700 |
commit | 119e50c7b9e50a388648ca9434ee1ace5c22867c (patch) | |
tree | 8034c682495abac953749ec657f9f5f040d5d123 /examples/src/main/scala | |
parent | 31ffe8d5284a4cda5eb8d21d3ea042cc5a2dc8b7 (diff) | |
parent | ff813e43809c3598f7ec46f7f562bc4952cfe54c (diff) | |
download | spark-119e50c7b9e50a388648ca9434ee1ace5c22867c.tar.gz spark-119e50c7b9e50a388648ca9434ee1ace5c22867c.tar.bz2 spark-119e50c7b9e50a388648ca9434ee1ace5c22867c.zip |
Conflict fixed
Diffstat (limited to 'examples/src/main/scala')
10 files changed, 10 insertions, 10 deletions
diff --git a/examples/src/main/scala/spark/examples/BroadcastTest.scala b/examples/src/main/scala/spark/examples/BroadcastTest.scala index 21de82cd87..230097c7db 100644 --- a/examples/src/main/scala/spark/examples/BroadcastTest.scala +++ b/examples/src/main/scala/spark/examples/BroadcastTest.scala @@ -5,7 +5,7 @@ import spark.SparkContext object BroadcastTest { def main(args: Array[String]) { if (args.length == 0) { - System.err.println("Usage: BroadcastTest <host> [<slices>] [numElem]") + System.err.println("Usage: BroadcastTest <master> [<slices>] [numElem]") System.exit(1) } diff --git a/examples/src/main/scala/spark/examples/ExceptionHandlingTest.scala b/examples/src/main/scala/spark/examples/ExceptionHandlingTest.scala index 90941ddbf0..c89f3dac0c 100644 --- a/examples/src/main/scala/spark/examples/ExceptionHandlingTest.scala +++ b/examples/src/main/scala/spark/examples/ExceptionHandlingTest.scala @@ -5,7 +5,7 @@ import spark.SparkContext object ExceptionHandlingTest { def main(args: Array[String]) { if (args.length == 0) { - System.err.println("Usage: ExceptionHandlingTest <host>") + System.err.println("Usage: ExceptionHandlingTest <master>") System.exit(1) } diff --git a/examples/src/main/scala/spark/examples/GroupByTest.scala b/examples/src/main/scala/spark/examples/GroupByTest.scala index 9d11692aeb..86dfba3a40 100644 --- a/examples/src/main/scala/spark/examples/GroupByTest.scala +++ b/examples/src/main/scala/spark/examples/GroupByTest.scala @@ -7,7 +7,7 @@ import java.util.Random object GroupByTest { def main(args: Array[String]) { if (args.length == 0) { - System.err.println("Usage: GroupByTest <host> [numMappers] [numKVPairs] [KeySize] [numReducers]") + System.err.println("Usage: GroupByTest <master> [numMappers] [numKVPairs] [KeySize] [numReducers]") System.exit(1) } diff --git a/examples/src/main/scala/spark/examples/MultiBroadcastTest.scala b/examples/src/main/scala/spark/examples/MultiBroadcastTest.scala index 240376da90..83ae014e94 100644 --- a/examples/src/main/scala/spark/examples/MultiBroadcastTest.scala +++ b/examples/src/main/scala/spark/examples/MultiBroadcastTest.scala @@ -5,7 +5,7 @@ import spark.SparkContext object MultiBroadcastTest { def main(args: Array[String]) { if (args.length == 0) { - System.err.println("Usage: BroadcastTest <host> [<slices>] [numElem]") + System.err.println("Usage: BroadcastTest <master> [<slices>] [numElem]") System.exit(1) } diff --git a/examples/src/main/scala/spark/examples/SimpleSkewedGroupByTest.scala b/examples/src/main/scala/spark/examples/SimpleSkewedGroupByTest.scala index c44b42c5b6..50b3a263b4 100644 --- a/examples/src/main/scala/spark/examples/SimpleSkewedGroupByTest.scala +++ b/examples/src/main/scala/spark/examples/SimpleSkewedGroupByTest.scala @@ -7,7 +7,7 @@ import java.util.Random object SimpleSkewedGroupByTest { def main(args: Array[String]) { if (args.length == 0) { - System.err.println("Usage: SimpleSkewedGroupByTest <host> " + + System.err.println("Usage: SimpleSkewedGroupByTest <master> " + "[numMappers] [numKVPairs] [valSize] [numReducers] [ratio]") System.exit(1) } diff --git a/examples/src/main/scala/spark/examples/SkewedGroupByTest.scala b/examples/src/main/scala/spark/examples/SkewedGroupByTest.scala index 9fad7ab2e5..d2117a263e 100644 --- a/examples/src/main/scala/spark/examples/SkewedGroupByTest.scala +++ b/examples/src/main/scala/spark/examples/SkewedGroupByTest.scala @@ -7,7 +7,7 @@ import java.util.Random object SkewedGroupByTest { def main(args: Array[String]) { if (args.length == 0) { - System.err.println("Usage: GroupByTest <host> [numMappers] [numKVPairs] [KeySize] [numReducers]") + System.err.println("Usage: GroupByTest <master> [numMappers] [numKVPairs] [KeySize] [numReducers]") System.exit(1) } diff --git a/examples/src/main/scala/spark/examples/SparkALS.scala b/examples/src/main/scala/spark/examples/SparkALS.scala index 59d5154e08..fb28e2c932 100644 --- a/examples/src/main/scala/spark/examples/SparkALS.scala +++ b/examples/src/main/scala/spark/examples/SparkALS.scala @@ -107,7 +107,7 @@ object SparkALS { host = host_ } case _ => { - System.err.println("Usage: SparkALS <M> <U> <F> <iters> <slices> <host>") + System.err.println("Usage: SparkALS <M> <U> <F> <iters> <slices> <master>") System.exit(1) } } diff --git a/examples/src/main/scala/spark/examples/SparkLR.scala b/examples/src/main/scala/spark/examples/SparkLR.scala index 6777b471fb..aaaf062c8f 100644 --- a/examples/src/main/scala/spark/examples/SparkLR.scala +++ b/examples/src/main/scala/spark/examples/SparkLR.scala @@ -25,7 +25,7 @@ object SparkLR { def main(args: Array[String]) { if (args.length == 0) { - System.err.println("Usage: SparkLR <host> [<slices>]") + System.err.println("Usage: SparkLR <master> [<slices>]") System.exit(1) } val sc = new SparkContext(args(0), "SparkLR") diff --git a/examples/src/main/scala/spark/examples/SparkPi.scala b/examples/src/main/scala/spark/examples/SparkPi.scala index 751fef6ab0..2f226f1380 100644 --- a/examples/src/main/scala/spark/examples/SparkPi.scala +++ b/examples/src/main/scala/spark/examples/SparkPi.scala @@ -7,7 +7,7 @@ import SparkContext._ object SparkPi { def main(args: Array[String]) { if (args.length == 0) { - System.err.println("Usage: SparkPi <host> [<slices>]") + System.err.println("Usage: SparkPi <master> [<slices>]") System.exit(1) } val spark = new SparkContext(args(0), "SparkPi") diff --git a/examples/src/main/scala/spark/examples/SparkTC.scala b/examples/src/main/scala/spark/examples/SparkTC.scala index a6e4de4671..90bae011ad 100644 --- a/examples/src/main/scala/spark/examples/SparkTC.scala +++ b/examples/src/main/scala/spark/examples/SparkTC.scala @@ -26,7 +26,7 @@ object SparkTC { def main(args: Array[String]) { if (args.length == 0) { - System.err.println("Usage: SparkTC <host> [<slices>]") + System.err.println("Usage: SparkTC <master> [<slices>]") System.exit(1) } val spark = new SparkContext(args(0), "SparkTC") |