You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@toree.apache.org by lr...@apache.org on 2017/01/31 23:48:33 UTC
[1/6] incubator-toree git commit: Update git configuration file
Repository: incubator-toree
Updated Branches:
refs/heads/sandbox [created] a0440207c
Update git configuration file
Project: http://git-wip-us.apache.org/repos/asf/incubator-toree/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-toree/commit/db0fd017
Tree: http://git-wip-us.apache.org/repos/asf/incubator-toree/tree/db0fd017
Diff: http://git-wip-us.apache.org/repos/asf/incubator-toree/diff/db0fd017
Branch: refs/heads/sandbox
Commit: db0fd017b9fe340eaee39cb9af38baf5c19830e8
Parents: 5051d0f
Author: Luciano Resende <lr...@apache.org>
Authored: Sat Jan 7 18:09:50 2017 -0800
Committer: Luciano Resende <lr...@apache.org>
Committed: Sat Jan 7 18:09:50 2017 -0800
----------------------------------------------------------------------
.gitignore | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/db0fd017/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index f692b1a..ef31f57 100644
--- a/.gitignore
+++ b/.gitignore
@@ -40,5 +40,7 @@ dist/
.ensime
.ensime_cache/
+.jekyll-metadata
+
Untitled*.ipynb
.system-test-image
[2/6] incubator-toree git commit: Update Spark version to 2.0.2
Posted by lr...@apache.org.
Update Spark version to 2.0.2
Project: http://git-wip-us.apache.org/repos/asf/incubator-toree/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-toree/commit/99f22682
Tree: http://git-wip-us.apache.org/repos/asf/incubator-toree/tree/99f22682
Diff: http://git-wip-us.apache.org/repos/asf/incubator-toree/diff/99f22682
Branch: refs/heads/sandbox
Commit: 99f22682d9fb3af5a01b2039011446cd6ecea1e3
Parents: db0fd01
Author: Luciano Resende <lr...@apache.org>
Authored: Sat Jan 7 18:16:16 2017 -0800
Committer: Luciano Resende <lr...@apache.org>
Committed: Sat Jan 7 18:16:16 2017 -0800
----------------------------------------------------------------------
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/99f22682/Makefile
----------------------------------------------------------------------
diff --git a/Makefile b/Makefile
index 79d3440..eaf6562 100644
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,7 @@ IS_SNAPSHOT?=true
SNAPSHOT:=-SNAPSHOT
endif
-APACHE_SPARK_VERSION?=2.0.0
+APACHE_SPARK_VERSION?=2.0.2
SCALA_VERSION?=2.11
IMAGE?=jupyter/all-spark-notebook:07a7c4d6d447
EXAMPLE_IMAGE?=apache/toree-examples
[4/6] incubator-toree git commit: [quick fix]: return result for
every statement
Posted by lr...@apache.org.
[quick fix]: return result for every statement
Project: http://git-wip-us.apache.org/repos/asf/incubator-toree/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-toree/commit/055712b7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-toree/tree/055712b7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-toree/diff/055712b7
Branch: refs/heads/sandbox
Commit: 055712b7871c93f82e75c370def19638dd9d2c49
Parents: 216d889
Author: Jakob Odersky <ja...@odersky.com>
Authored: Fri Jan 27 11:52:29 2017 -0800
Committer: Luciano Resende <lr...@apache.org>
Committed: Fri Jan 27 12:13:29 2017 -0800
----------------------------------------------------------------------
.../apache/toree/kernel/interpreter/scala/ScalaInterpreter.scala | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/055712b7/scala-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/scala/ScalaInterpreter.scala
----------------------------------------------------------------------
diff --git a/scala-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/scala/ScalaInterpreter.scala b/scala-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/scala/ScalaInterpreter.scala
index 3dec18c..87887c3 100644
--- a/scala-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/scala/ScalaInterpreter.scala
+++ b/scala-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/scala/ScalaInterpreter.scala
@@ -180,7 +180,7 @@ class ScalaInterpreter(private val config:Config = ConfigFactory.load) extends I
returnStr
}
- case _ => ""
+ case str => str
}
[6/6] incubator-toree git commit: [quick fix]: return result for
methods of unit return type
Posted by lr...@apache.org.
[quick fix]: return result for methods of unit return type
Project: http://git-wip-us.apache.org/repos/asf/incubator-toree/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-toree/commit/a0440207
Tree: http://git-wip-us.apache.org/repos/asf/incubator-toree/tree/a0440207
Diff: http://git-wip-us.apache.org/repos/asf/incubator-toree/diff/a0440207
Branch: refs/heads/sandbox
Commit: a0440207c91c3783dfb754a2df87328ed288a1a2
Parents: dffc325
Author: Luciano Resende <lr...@apache.org>
Authored: Tue Jan 31 15:48:23 2017 -0800
Committer: Luciano Resende <lr...@apache.org>
Committed: Tue Jan 31 15:48:23 2017 -0800
----------------------------------------------------------------------
.../protocol/v5/handler/ExecuteRequestHandler.scala | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/a0440207/kernel/src/main/scala/org/apache/toree/kernel/protocol/v5/handler/ExecuteRequestHandler.scala
----------------------------------------------------------------------
diff --git a/kernel/src/main/scala/org/apache/toree/kernel/protocol/v5/handler/ExecuteRequestHandler.scala b/kernel/src/main/scala/org/apache/toree/kernel/protocol/v5/handler/ExecuteRequestHandler.scala
index 8060b41..7c25bf2 100644
--- a/kernel/src/main/scala/org/apache/toree/kernel/protocol/v5/handler/ExecuteRequestHandler.scala
+++ b/kernel/src/main/scala/org/apache/toree/kernel/protocol/v5/handler/ExecuteRequestHandler.scala
@@ -91,13 +91,13 @@ class ExecuteRequestHandler(
relayMsg(executeReplyMsg, relayActor)
// Send an ExecuteResult with the result of the code execution
- if (executeResult.hasContent) {
- val executeResultMsg = skeletonBuilder
- .withIds(Seq(MessageType.Outgoing.ExecuteResult.toString))
- .withHeader(MessageType.Outgoing.ExecuteResult)
- .withContentString(executeResult).build
- relayMsg(executeResultMsg, relayActor)
- }
+ // if (executeResult.hasContent) {
+ val executeResultMsg = skeletonBuilder
+ .withIds(Seq(MessageType.Outgoing.ExecuteResult.toString))
+ .withHeader(MessageType.Outgoing.ExecuteResult)
+ .withContentString(executeResult).build
+ relayMsg(executeResultMsg, relayActor)
+ // }
case Failure(error: Throwable) =>
// Send an ExecuteReplyError to the client on the Shell socket
[5/6] incubator-toree git commit: Update Play JSON to version 2.5.9
Posted by lr...@apache.org.
Update Play JSON to version 2.5.9
Project: http://git-wip-us.apache.org/repos/asf/incubator-toree/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-toree/commit/dffc3253
Tree: http://git-wip-us.apache.org/repos/asf/incubator-toree/tree/dffc3253
Diff: http://git-wip-us.apache.org/repos/asf/incubator-toree/diff/dffc3253
Branch: refs/heads/sandbox
Commit: dffc3253abf14ef51ac99f48f8da46c1981b8ac3
Parents: 055712b
Author: Luciano Resende <lr...@apache.org>
Authored: Fri Jan 27 14:04:46 2017 -0800
Committer: Luciano Resende <lr...@apache.org>
Committed: Sun Jan 29 00:09:05 2017 -0800
----------------------------------------------------------------------
kernel/build.sbt | 4 ++++
protocol/build.sbt | 4 ++--
2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/dffc3253/kernel/build.sbt
----------------------------------------------------------------------
diff --git a/kernel/build.sbt b/kernel/build.sbt
index 0965dce..52ba9cf 100644
--- a/kernel/build.sbt
+++ b/kernel/build.sbt
@@ -18,6 +18,10 @@
//
// TEST DEPENDENCIES
//
+
+libraryDependencies +=
+ "com.typesafe.play" %% "play-json" % "2.5.9"
+
libraryDependencies +=
"com.typesafe.akka" %% "akka-testkit" % "2.4.8" % "test" // MIT
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/dffc3253/protocol/build.sbt
----------------------------------------------------------------------
diff --git a/protocol/build.sbt b/protocol/build.sbt
index f82b465..cff5969 100644
--- a/protocol/build.sbt
+++ b/protocol/build.sbt
@@ -19,8 +19,8 @@
// JSON DEPENDENCIES
//
libraryDependencies ++= Seq(
- "com.typesafe.play" %% "play-json" % "2.3.10" excludeAll( // Apache v2
- ExclusionRule(organization = "com.fasterxml.jackson.core")
+ "com.typesafe.play" %% "play-json" % "2.5.9" excludeAll( // Apache v2
+ //ExclusionRule(organization = "com.fasterxml.jackson.core")
),
"org.slf4j" % "slf4j-api" % "1.7.21" // MIT
)
[3/6] incubator-toree git commit: Add git configuration for line
ending
Posted by lr...@apache.org.
Add git configuration for line ending
Project: http://git-wip-us.apache.org/repos/asf/incubator-toree/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-toree/commit/216d8890
Tree: http://git-wip-us.apache.org/repos/asf/incubator-toree/tree/216d8890
Diff: http://git-wip-us.apache.org/repos/asf/incubator-toree/diff/216d8890
Branch: refs/heads/sandbox
Commit: 216d8890ea5e3c5255b46bf944c6ffff53422477
Parents: 99f2268
Author: Luciano Resende <lr...@apache.org>
Authored: Sat Jan 7 20:08:56 2017 -0800
Committer: Luciano Resende <lr...@apache.org>
Committed: Sat Jan 7 20:08:56 2017 -0800
----------------------------------------------------------------------
.gitattributes | 13 +++++++++++++
1 file changed, 13 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/216d8890/.gitattributes
----------------------------------------------------------------------
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..a8edefd
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,13 @@
+# Set the default behavior to have all files normalized to Unix-style
+# line endings upon check-in.
+* text=auto
+
+# Declare files that will always have CRLF line endings on checkout.
+*.bat text eol=crlf
+
+# Denote all files that are truly binary and should not be modified.
+*.dll binary
+*.exp binary
+*.lib binary
+*.pdb binary
+*.exe binary