You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@predictionio.apache.org by sh...@apache.org on 2019/02/26 03:03:15 UTC

[predictionio] 01/01: Merge branch 'livedoc' into develop

This is an automated email from the ASF dual-hosted git repository.

shimamoto pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/predictionio.git

commit 4f0507f6c1a2281dc07d47fb1d30855c9c915779
Merge: 4fe28b9 81cc94e
Author: shimamoto <sh...@apache.org>
AuthorDate: Tue Feb 26 12:01:26 2019 +0900

    Merge branch 'livedoc' into develop
    
    # Conflicts:
    #	README.md

 .../{install => archived}/launch-aws.html.md.erb   |   0
 .../community/contribute-documentation.html.md     |   2 +-
 docs/manual/source/index.html.md.erb               |   4 +-
 docs/manual/source/install/index.html.md.erb       |   6 +-
 .../source/install/install-docker.html.md.erb      | 127 +++++++++++++++++++++
 docs/manual/source/resources/upgrade.html.md       |   2 +-
 docs/manual/source/start/index.html.md             |   2 +-
 .../recommendation/quickstart.html.md.erb          |  20 ++--
 8 files changed, 144 insertions(+), 19 deletions(-)