diff options
| author | Michael Armbrust <michael@databricks.com> | 2014-07-25 15:36:57 -0700 |
|---|---|---|
| committer | Michael Armbrust <michael@databricks.com> | 2014-07-25 15:36:57 -0700 |
| commit | afd757a241f41d7f8c458ef8f1f9ce8ed12986e5 (patch) | |
| tree | 136e49b3392763acd5f952b70a50137cb96e9c75 /bin/spark-shell | |
| parent | 37ad3b724590dcf42bcdbfaf91b7a11914501945 (diff) | |
| download | spark-afd757a241f41d7f8c458ef8f1f9ce8ed12986e5.tar.gz spark-afd757a241f41d7f8c458ef8f1f9ce8ed12986e5.tar.bz2 spark-afd757a241f41d7f8c458ef8f1f9ce8ed12986e5.zip | |
Revert "[SPARK-2410][SQL] Merging Hive Thrift/JDBC server"
This reverts commit 06dc0d2c6b69c5d59b4d194ced2ac85bfe2e05e2.
#1399 is making Jenkins fail. We should investigate and put this back after its passing tests.
Author: Michael Armbrust <michael@databricks.com>
Closes #1594 from marmbrus/revertJDBC and squashes the following commits:
59748da [Michael Armbrust] Revert "[SPARK-2410][SQL] Merging Hive Thrift/JDBC server"
Diffstat (limited to 'bin/spark-shell')
| -rwxr-xr-x | bin/spark-shell | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bin/spark-shell b/bin/spark-shell index 756c8179d1..850e9507ec 100755 --- a/bin/spark-shell +++ b/bin/spark-shell @@ -46,11 +46,11 @@ function main(){ # (see https://github.com/sbt/sbt/issues/562). stty -icanon min 1 -echo > /dev/null 2>&1 export SPARK_SUBMIT_OPTS="$SPARK_SUBMIT_OPTS -Djline.terminal=unix" - $FWDIR/bin/spark-submit --class org.apache.spark.repl.Main spark-shell "$@" + $FWDIR/bin/spark-submit spark-shell "$@" --class org.apache.spark.repl.Main stty icanon echo > /dev/null 2>&1 else export SPARK_SUBMIT_OPTS - $FWDIR/bin/spark-submit --class org.apache.spark.repl.Main spark-shell "$@" + $FWDIR/bin/spark-submit spark-shell "$@" --class org.apache.spark.repl.Main fi } |