From commits-return-5510-archive-asf-public=cust-asf.ponee.io@predictionio.apache.org Sun Oct 7 16:56:11 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 462DF18077A for ; Sun, 7 Oct 2018 16:56:10 +0200 (CEST) Received: (qmail 89352 invoked by uid 500); 7 Oct 2018 14:56:09 -0000 Mailing-List: contact commits-help@predictionio.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@predictionio.apache.org Delivered-To: mailing list commits@predictionio.apache.org Received: (qmail 89272 invoked by uid 99); 7 Oct 2018 14:56:09 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 07 Oct 2018 14:56:09 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id A6C1F82C31; Sun, 7 Oct 2018 14:56:08 +0000 (UTC) Date: Sun, 07 Oct 2018 14:56:10 +0000 To: "commits@predictionio.apache.org" Subject: [predictionio] 02/02: Merge branch 'updateDeps' of https://github.com/goldstar/predictionio into develop MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit From: emergentorder@apache.org In-Reply-To: <153892416853.30086.478882854542542060@gitbox.apache.org> References: <153892416853.30086.478882854542542060@gitbox.apache.org> X-Git-Host: gitbox.apache.org X-Git-Repo: predictionio X-Git-Refname: refs/heads/develop X-Git-Reftype: branch X-Git-Rev: 17eb04645e62fcaebbcbcf4a51a4dff2122089bb X-Git-NotificationType: diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated Message-Id: <20181007145608.A6C1F82C31@gitbox.apache.org> 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 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(-)