predictionio-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From emergentor...@apache.org
Subject [predictionio] 02/02: Merge branch 'updateDeps' of https://github.com/goldstar/predictionio into develop
Date Sun, 07 Oct 2018 14:56:10 GMT
This is an automated email from the ASF dual-hosted git repository.

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

commit 17eb04645e62fcaebbcbcf4a51a4dff2122089bb
Merge: af4d6e6 22e3d6d
Author: Alex Merritt <lecaran@gmail.com>
AuthorDate: Sun Oct 7 09:55:32 2018 -0500

    Merge branch 'updateDeps' of https://github.com/goldstar/predictionio into develop

 .travis.yml                                        | 44 +++++++++++-----------
 LICENSE.txt                                        | 10 ++---
 bin/install.sh                                     |  2 +-
 build.sbt                                          |  8 ++--
 conf/pio-env.sh.template                           |  2 +-
 conf/pio-vendors.sh                                |  4 +-
 docs/manual/data/versions.yml                      |  2 +-
 .../source/install/install-sourcecode.html.md.erb  |  4 +-
 project/build.properties                           |  2 +-
 storage/elasticsearch/build.sbt                    |  4 +-
 .../data/storage/elasticsearch/ESAccessKeys.scala  | 37 +++++++++---------
 .../data/storage/elasticsearch/ESApps.scala        | 38 ++++++++++---------
 .../data/storage/elasticsearch/ESChannels.scala    | 35 ++++++++---------
 .../storage/elasticsearch/ESEngineInstances.scala  |  4 +-
 .../elasticsearch/ESEvaluationInstances.scala      | 39 +++++++++----------
 .../data/storage/elasticsearch/ESSequences.scala   | 15 ++++----
 16 files changed, 128 insertions(+), 122 deletions(-)



Mime
View raw message