Skip to content

[Spark-1234] clean up text in running-on-yarn.md yarn-client section #130

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
dianacarroll wants to merge 3 commits into from
Closed

[Spark-1234] clean up text in running-on-yarn.md yarn-client section #130

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0309cf9
SPARK-1134 bug with ipython prevents non-interactive use with spark; …
Feb 27, 2014
98b3828
Cleaned up text of yarn-client instructions. [SPARK-1234]
Mar 12, 2014
1dfbc4d
fix typo in running-on-yarn default SPARK_MASTER_MEMORY values
Mar 20, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
SPARK-1134 bug with ipython prevents non-interactive use with spark; … 
…only call ipython if no command line arguments were supplied
  • Loading branch information
Diana Carroll committed Feb 27, 2014
commit 0309cf911cc0379b7de871463c25a7c105202f4b
3 changes: 2 additions & 1 deletion bin/pyspark
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,8 @@ if [ -n "$IPYTHON_OPTS" ]; then
IPYTHON=1
fi

if [[ "$IPYTHON" = "1" ]] ; then
# Only use ipython if no command line arguments were provided [SPARK-1134]
if [[ "$IPYTHON" = "1" && $# = 0 ]] ; then
exec ipython $IPYTHON_OPTS
else
exec "$PYSPARK_PYTHON" "$@"
Expand Down