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/9e98d905 Tree: http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-skeleton/tree/9e98d905 Diff: http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-skeleton/diff/9e98d905 Branch: refs/heads/master Commit: 9e98d905caf5beaddda98d483e4ee7bd7a9181bd Parents: 1ebdace 5494f06 Author: Donald Szeto <[email protected]> Authored: Wed May 3 17:08:08 2017 -0700 Committer: Donald Szeto <[email protected]> Committed: Wed May 3 17:08:08 2017 -0700 ---------------------------------------------------------------------- README.md | 9 +++++++- build.properties | 1 + build.sbt | 14 ++++++------- engine.json | 2 +- project/assembly.sbt | 2 +- src/main/scala/Algorithm.scala | 2 +- src/main/scala/DataSource.scala | 2 +- src/main/scala/Engine.scala | 6 +++--- src/main/scala/Preparator.scala | 2 +- src/main/scala/Serving.scala | 2 +- src/test/scala/AlgorithmTest.scala | 26 ++++++++++++++++++++++++ src/test/scala/DataSourceTest.scala | 15 ++++++++++++++ src/test/scala/EngineTest.scala | 15 ++++++++++++++ src/test/scala/PreparatorTest.scala | 23 +++++++++++++++++++++ src/test/scala/ServingTest.scala | 23 +++++++++++++++++++++ src/test/scala/SharedSingletonContext.scala | 24 ++++++++++++++++++++++ 16 files changed, 150 insertions(+), 18 deletions(-) ----------------------------------------------------------------------
