You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@toree.apache.org by ma...@apache.org on 2017/02/16 18:35:39 UTC

[7/7] incubator-toree git commit: TOREE-382 Merging pr #101

TOREE-382 Merging pr #101


Project: http://git-wip-us.apache.org/repos/asf/incubator-toree/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-toree/commit/5743f068
Tree: http://git-wip-us.apache.org/repos/asf/incubator-toree/tree/5743f068
Diff: http://git-wip-us.apache.org/repos/asf/incubator-toree/diff/5743f068

Branch: refs/heads/master
Commit: 5743f068d9ee65132a20598a7bae9279f2a5cebf
Parents: e5ef3a1 464c367
Author: mariusvniekerk <ma...@gmail.com>
Authored: Thu Feb 16 13:35:27 2017 -0500
Committer: mariusvniekerk <ma...@gmail.com>
Committed: Thu Feb 16 13:35:27 2017 -0500

----------------------------------------------------------------------
 .gitattributes                |  17 +++
 Makefile                      |   5 +-
 build.sbt                     | 204 ++++++++++++++++++++++-----
 client/build.sbt              |   8 +-
 communication/build.sbt       |   8 +-
 kernel-api/build.sbt          |  22 +--
 kernel/build.sbt              |   5 +-
 macros/build.sbt              |   8 +-
 plugins/build.sbt             |  13 +-
 project/CommonPlugin.scala    |  64 +++++++++
 project/Dependencies.scala    |  88 ++++++++++++
 project/build.properties      |   3 +-
 project/common.scala          | 279 -------------------------------------
 project/plugins.sbt           |  30 +---
 protocol/build.sbt            |  16 ++-
 pyspark-interpreter/build.sbt |   1 +
 scala-interpreter/build.sbt   |  38 +----
 sparkr-interpreter/build.sbt  |   1 +
 sql-interpreter/build.sbt     |   1 +
 19 files changed, 386 insertions(+), 425 deletions(-)
----------------------------------------------------------------------