diff --git a/bin/pyspark b/bin/pyspark index 55528ed7e4f12..0b4f695dd06dd 100755 --- a/bin/pyspark +++ b/bin/pyspark @@ -60,9 +60,6 @@ fi # # For backwards-compatibility, we retain the old IPYTHON and IPYTHON_OPTS variables. -export PYSPARK_DRIVER_PYTHON=ipython -export PYSPARK_DRIVER_PYTHON_OPTS=notebook - # Determine the Python executable to use if PYSPARK_PYTHON or PYSPARK_DRIVER_PYTHON isn't set: if hash python2.7 2>/dev/null; then # Attempt to use Python 2.7, if installed: diff --git a/examples/src/main/scala/org/apache/spark/examples/graphx/LiveJournalPageRank.scala b/examples/src/main/scala/org/apache/spark/examples/graphx/LiveJournalPageRank.scala index 30b5a92ba76e7..f6f8d9f90c275 100644 --- a/examples/src/main/scala/org/apache/spark/examples/graphx/LiveJournalPageRank.scala +++ b/examples/src/main/scala/org/apache/spark/examples/graphx/LiveJournalPageRank.scala @@ -25,7 +25,7 @@ object LiveJournalPageRank { def main(args: Array[String]) { if (args.length < 1) { System.err.println( - "Usage: LiveJournalPageRank --numEPart=\n" + + "Usage: LiveJournalPageRank \n" + " --numEPart=\n" + " The number of partitions for the graph's edge RDD.\n" + " [--tol=]\n" +