You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@predictionio.apache.org by em...@apache.org on 2018/10/07 14:56:10 UTC
[predictionio] 02/02: Merge branch 'updateDeps' of
https://github.com/goldstar/predictionio into develop
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 <le...@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(-)