Merge branch 'release/0.13.0' into livedoc

Project: http://git-wip-us.apache.org/repos/asf/predictionio/repo
Commit: http://git-wip-us.apache.org/repos/asf/predictionio/commit/5da595b9
Tree: http://git-wip-us.apache.org/repos/asf/predictionio/tree/5da595b9
Diff: http://git-wip-us.apache.org/repos/asf/predictionio/diff/5da595b9

Branch: refs/heads/develop
Commit: 5da595b963c09431eeb753252c9e2befae4231f7
Parents: 844486a 1856635
Author: shimamoto <shimam...@apache.org>
Authored: Wed Sep 19 20:04:37 2018 +0900
Committer: shimamoto <shimam...@apache.org>
Committed: Wed Sep 19 20:04:37 2018 +0900

----------------------------------------------------------------------
 .travis.yml                                     | 35 +++++++++++-
 KEYS                                            | 58 ++++++++++++++++++++
 RELEASE.md                                      | 26 +++++++++
 bin/pio-class                                   |  2 +-
 build.sbt                                       | 12 +++-
 conf/pio-vendors.sh                             |  3 +-
 .../apache/predictionio/controller/Engine.scala |  4 +-
 .../apache/predictionio/core/AbstractDoer.scala |  2 +-
 .../core/SelfCleaningDataSource.scala           |  4 +-
 .../predictionio/workflow/FakeWorkflow.scala    |  2 +-
 .../mailchimp/MailChimpConnectorSpec.scala      | 12 ++--
 data/test.sh                                    |  2 +-
 docs/manual/data/versions.yml                   |  2 +-
 .../manual/source/datacollection/plugin.html.md |  2 +-
 docs/manual/source/deploy/plugin.html.md        |  2 +-
 docs/manual/source/install/index.html.md.erb    |  3 +
 .../install/install-sourcecode.html.md.erb      |  6 +-
 docs/manual/source/system/index.html.md         |  8 ---
 docs/scaladoc/README.md                         |  2 +-
 .../scala-parallel-classification/README.md     |  2 +-
 .../add-algorithm/build.sbt                     |  2 +-
 .../reading-custom-properties/build.sbt         |  2 +-
 .../README.md                                   |  2 +-
 .../adjust-score/build.sbt                      |  2 +-
 .../train-with-rate-event/build.sbt             |  2 +-
 .../scala-parallel-recommendation/README.md     |  2 +-
 .../blacklist-items/build.sbt                   |  2 +-
 .../customize-data-prep/build.sbt               |  2 +-
 .../customize-serving/build.sbt                 |  2 +-
 .../reading-custom-events/build.sbt             |  2 +-
 .../train-with-view-event/build.sbt             |  2 +-
 .../scala-parallel-similarproduct/README.md     |  2 +-
 .../multi-events-multi-algos/build.sbt          |  2 +-
 .../recommended-user/build.sbt                  |  2 +-
 .../return-item-properties/build.sbt            |  2 +-
 .../rid-user-set-event/build.sbt                |  2 +-
 .../train-with-rate-event/build.sbt             |  2 +-
 .../data/storage/hbase/HBEventsUtil.scala       |  2 +-
 .../data/storage/jdbc/JDBCUtils.scala           | 12 ++--
 .../data/storage/jdbc/JDBCUtilsSpec.scala       | 50 +++++++++++++++++
 tests/build_docker.sh                           |  7 ++-
 tests/pio_tests/README.md                       |  4 +-
 .../engines/recommendation-engine/build.sbt     |  2 +-
 tests/pio_tests/utils.py                        |  2 +-
 .../predictionio/tools/commands/App.scala       |  2 +-
 .../tools/commands/Management.scala             |  2 +-
 46 files changed, 240 insertions(+), 66 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/predictionio/blob/5da595b9/docs/manual/source/system/index.html.md
----------------------------------------------------------------------
diff --cc docs/manual/source/system/index.html.md
index b4fe884,dcff342..8e9667d
--- a/docs/manual/source/system/index.html.md
+++ b/docs/manual/source/system/index.html.md
@@@ -19,19 -19,7 +19,11 @@@ See the License for the specific langua
  limitations under the License.
  -->
  
- During the [installation](/install), you have installed the latest stable
- versions of the following software:
- 
- * Apache Hadoop up to 2.7.2 (required only if YARN and HDFS are needed)
- * Apache HBase up to 1.2.4
- * Apache Spark up to 1.6.3, or up to 2.3.1
- * Elasticsearch up to 1.7.5, or up to 5.6.11
- 
 -This section explains general rules-of-thumb for how they are used in 
PredictionIO. The actual implementation of the Template will define how much of 
this applies. PredictionIO is flexible about much of this configuration but its 
Templates generally fit the Lambda model for integrating real-time serving with 
background periodic model updates.
 +This section explains general rules-of-thumb for how they are used in
 +PredictionIO. The actual implementation of the Template will define how much 
of
 +this applies. PredictionIO is flexible about much of this configuration but 
its
 +Templates generally fit the Lambda model for integrating real-time serving 
with
 +background periodic model updates.
  
  ![PredictionIO Systems](/images/pio-architecture.svg)
  

Reply via email to