diff options
| author | Hossein Falaki <falaki@gmail.com> | 2014-01-07 21:28:26 -0800 |
|---|---|---|
| committer | Hossein Falaki <falaki@gmail.com> | 2014-01-07 21:28:26 -0800 |
| commit | 46cb980a5f5ba55f341b8bcce4f0d1e5213989d3 (patch) | |
| tree | ff3823085f27c0f4477d25a056d333c429c5d6c9 /docs/java-programming-guide.md | |
| parent | 150089dae12bbba693db4edbfcea360b443637df (diff) | |
| parent | b2e690f839e7ee47f405135d35170173386c5d13 (diff) | |
| download | spark-46cb980a5f5ba55f341b8bcce4f0d1e5213989d3.tar.gz spark-46cb980a5f5ba55f341b8bcce4f0d1e5213989d3.tar.bz2 spark-46cb980a5f5ba55f341b8bcce4f0d1e5213989d3.zip | |
Fixed merge conflict
Diffstat (limited to 'docs/java-programming-guide.md')
| -rw-r--r-- | docs/java-programming-guide.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/java-programming-guide.md b/docs/java-programming-guide.md index 53085cc671..07732fa122 100644 --- a/docs/java-programming-guide.md +++ b/docs/java-programming-guide.md @@ -190,9 +190,9 @@ We hope to generate documentation with Java-style syntax in the future. Spark includes several sample programs using the Java API in [`examples/src/main/java`](https://github.com/apache/incubator-spark/tree/master/examples/src/main/java/org/apache/spark/examples). You can run them by passing the class name to the -`run-example` script included in Spark; for example: +`bin/run-example` script included in Spark; for example: - ./run-example org.apache.spark.examples.JavaWordCount + ./bin/run-example org.apache.spark.examples.JavaWordCount Each example program prints usage help when run without any arguments. |