Merge branch 'develop'
Project: http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-ecom-recommender/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-ecom-recommender/commit/eff34b53 Tree: http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-ecom-recommender/tree/eff34b53 Diff: http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-ecom-recommender/diff/eff34b53 Branch: refs/heads/master Commit: eff34b53720792e51688055787769a7e054c4661 Parents: 2e22714 1d0d71d Author: Donald Szeto <[email protected]> Authored: Thu May 4 08:53:54 2017 -0700 Committer: Donald Szeto <[email protected]> Committed: Thu May 4 08:53:54 2017 -0700 ---------------------------------------------------------------------- README.md | 6 ++++++ build.sbt | 8 +------- engine.json | 2 +- project/assembly.sbt | 2 +- project/build.properties | 1 + src/main/scala/DataSource.scala | 2 +- src/main/scala/ECommAlgorithm.scala | 2 +- src/main/scala/Engine.scala | 2 +- src/main/scala/Preparator.scala | 2 +- src/main/scala/Serving.scala | 2 +- src/test/scala/ECommAlgorithmTest.scala | 2 +- src/test/scala/EngineTestSparkContext.scala | 2 +- src/test/scala/PreparatorTest.scala | 2 +- 13 files changed, 18 insertions(+), 17 deletions(-) ----------------------------------------------------------------------
