Merge branch 'develop'
Project: http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-skeleton/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-skeleton/commit/1ebdace6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-skeleton/tree/1ebdace6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-skeleton/diff/1ebdace6 Branch: refs/heads/master Commit: 1ebdace6a0d4d5a165d22b0c019aa07fd71f0052 Parents: a32a34f 8563484 Author: Donald Szeto <[email protected]> Authored: Tue Nov 1 14:39:48 2016 -0700 Committer: Donald Szeto <[email protected]> Committed: Tue Nov 1 14:39:48 2016 -0700 ---------------------------------------------------------------------- README.md | 6 +++++- build.sbt | 8 ++++---- project/pio-build.sbt | 1 - src/main/scala/Algorithm.scala | 4 ++-- src/main/scala/DataSource.scala | 12 ++++++------ src/main/scala/Engine.scala | 4 ++-- src/main/scala/Preparator.scala | 4 ++-- src/main/scala/Serving.scala | 2 +- template.json | 2 +- 9 files changed, 23 insertions(+), 20 deletions(-) ----------------------------------------------------------------------
