You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@predictionio.apache.org by do...@apache.org on 2016/07/26 19:09:01 UTC
[3/4] incubator-predictionio git commit: Merge branch 'develop' of
https://github.com/apache/incubator-predictionio into template-gallery
Merge branch 'develop' of https://github.com/apache/incubator-predictionio into template-gallery
Project: http://git-wip-us.apache.org/repos/asf/incubator-predictionio/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-predictionio/commit/70189349
Tree: http://git-wip-us.apache.org/repos/asf/incubator-predictionio/tree/70189349
Diff: http://git-wip-us.apache.org/repos/asf/incubator-predictionio/diff/70189349
Branch: refs/heads/develop
Commit: 701893494a0d8b66692648a511e9e960d1f2ab78
Parents: b0687ae c6be800
Author: Marcin Ziemi\u0144ski <zi...@gmail.com>
Authored: Mon Jul 25 17:01:15 2016 -0700
Committer: Marcin Ziemi\u0144ski <zi...@gmail.com>
Committed: Mon Jul 25 17:01:15 2016 -0700
----------------------------------------------------------------------
bin/install.sh | 9 ++-
.../authentication/KeyAuthentication.scala | 5 +-
conf/server.conf | 3 +
.../predictionio/workflow/CreateServer.scala | 11 ++--
.../predictionio/data/api/EventServer.scala | 10 ++--
.../webhooks/segmentio/SegmentIOConnector.scala | 58 ++++++++++----------
scalastyle-config.xml | 9 +++
.../tools/dashboard/Dashboard.scala | 6 +-
8 files changed, 67 insertions(+), 44 deletions(-)
----------------------------------------------------------------------