diff options
| author | Matei Zaharia <matei@eecs.berkeley.edu> | 2012-06-03 17:44:04 -0700 |
|---|---|---|
| committer | Matei Zaharia <matei@eecs.berkeley.edu> | 2012-06-03 17:44:04 -0700 |
| commit | dbc3c86ae37b815e0c4e2431bc218cb79fa1a4be (patch) | |
| tree | 2818303050911934a1104954aa5bdfa67bce144d /repl | |
| parent | bd2ab635a784ea031c52421587ffcfd0e7711267 (diff) | |
| parent | 1dd7d3dffffff907b47098117e0b09b993000629 (diff) | |
| download | spark-dbc3c86ae37b815e0c4e2431bc218cb79fa1a4be.tar.gz spark-dbc3c86ae37b815e0c4e2431bc218cb79fa1a4be.tar.bz2 spark-dbc3c86ae37b815e0c4e2431bc218cb79fa1a4be.zip | |
Merge branch 'master' into mesos-0.9
Conflicts:
core/src/main/scala/spark/Executor.scala
Diffstat (limited to 'repl')
| -rw-r--r-- | repl/src/main/scala/spark/repl/Main.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/repl/src/main/scala/spark/repl/Main.scala b/repl/src/main/scala/spark/repl/Main.scala index b4a2bb05f9..58809ab646 100644 --- a/repl/src/main/scala/spark/repl/Main.scala +++ b/repl/src/main/scala/spark/repl/Main.scala @@ -7,7 +7,7 @@ object Main { def interp = _interp - private[repl] def interp_=(i: SparkILoop) { _interp = i } + def interp_=(i: SparkILoop) { _interp = i } def main(args: Array[String]) { _interp = new SparkILoop |