Repository: incubator-toree Updated Branches: refs/heads/AddJRubySupport [created] 225eb62f9 refs/heads/AddMacrosForDependencies [created] c3de594c7 refs/heads/AddNightlyBuildSupport [created] d68f07acd refs/heads/AddZeppelinSupport [created] 96b4c0c32 refs/heads/ExtraStuff [created] db9429993 refs/heads/MonitorMemory [created] f72176ae7 refs/heads/branch-0.1.3 [created] 9bd066292 refs/heads/branch-0.1.4 [created] c4e459f63 refs/heads/gh-pages [created] 0fefd2a5e refs/heads/issue-123-make-imports-configurable [created] 36c1ace0e refs/heads/master [created] 0a5a7f6ba refs/heads/sqlInjection [created] ca1feaae8 Updated Tags: refs/tags/v0.1.2 [created] 16919853d refs/tags/v0.1.2-jeromq [created] b673937de refs/tags/v0.1.5-assembly [created] ecfa5dd2a
Merge pull request #191 from bpburns/sparkcontext Option to create SparkContext programmatically. New API is kernel.createSparkContext(String, String) or kernel.createSparkContext(SparkConf) Project: http://git-wip-us.apache.org/repos/asf/incubator-toree/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-toree/commit/9db161f8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-toree/tree/9db161f8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-toree/diff/9db161f8 Branch: refs/heads/master Commit: 9db161f8667a3f148cd5d811be044db137db13c9 Parents: c054ae0 18708cc Author: Brian Burns <brian.p.bu...@gmail.com> Authored: Wed Nov 4 09:20:13 2015 -0500 Committer: Brian Burns <brian.p.bu...@gmail.com> Committed: Wed Nov 4 09:20:13 2015 -0500 ---------------------------------------------------------------------- .../spark/interpreter/broker/BrokerBridge.scala | 20 +-- .../com/ibm/spark/kernel/api/KernelLike.scala | 17 ++ .../scala/com/ibm/spark/magic/MagicLoader.scala | 2 +- .../interpreter/broker/BrokerBridgeSpec.scala | 37 +---- .../com/ibm/spark/boot/CommandLineOptions.scala | 7 +- .../com/ibm/spark/boot/KernelBootstrap.scala | 11 +- .../boot/layer/ComponentInitialization.scala | 37 +++-- .../scala/com/ibm/spark/kernel/api/Kernel.scala | 161 ++++++++++++++++++- .../StandardComponentInitializationSpec.scala | 2 + .../com/ibm/spark/kernel/api/KernelSpec.scala | 53 +++++- .../InterpreterActorSpecForIntegration.scala | 8 +- .../scala/test/utils/SparkKernelDeployer.scala | 6 +- .../main/resources/PySpark/pyspark_runner.py | 22 ++- .../interpreter/pyspark/PySparkBridge.scala | 15 +- .../pyspark/PySparkInterpreter.scala | 7 +- .../interpreter/pyspark/PySparkProcess.scala | 2 + .../interpreter/pyspark/PySparkService.scala | 4 +- resources/compile/reference.conf | 2 + .../interpreter/scala/ScalaInterpreter.scala | 3 + .../src/main/resources/kernelR/sparkr_runner.R | 18 ++- .../interpreter/sparkr/SparkRBridge.scala | 15 +- .../interpreter/sparkr/SparkRInterpreter.scala | 7 +- .../kernel/interpreter/sql/SqlInterpreter.scala | 5 +- .../kernel/interpreter/sql/SqlService.scala | 7 +- 24 files changed, 340 insertions(+), 128 deletions(-) ----------------------------------------------------------------------
