You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@predictionio.apache.org by ap...@apache.org on 2016/06/27 19:31:37 UTC
[23/50] [abbrv] incubator-predictionio git commit: Merge pull request
#211 from relateiq/ng
Merge pull request #211 from relateiq/ng
Add TLS and simple key auth
Project: http://git-wip-us.apache.org/repos/asf/incubator-predictionio/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-predictionio/commit/de2630f5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-predictionio/tree/de2630f5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-predictionio/diff/de2630f5
Branch: refs/heads/master
Commit: de2630f59ff6d653d87975a491304fd23e5b20c5
Parents: acd9e3f bc7ab1d
Author: Donald Szeto <do...@prediction.io>
Authored: Wed Mar 2 22:33:58 2016 -0800
Committer: Donald Szeto <do...@prediction.io>
Committed: Wed Mar 2 22:33:58 2016 -0800
----------------------------------------------------------------------
common/build.sbt | 5 ++
common/src/main/resources/application.conf | 11 ++++
.../authentication/KeyAuthentication.scala | 43 +++++++++++++++
.../configuration/SSLConfiguration.scala | 52 +++++++++++++++++++
conf/keystore.jks | Bin 0 -> 2238 bytes
conf/server.conf | 13 +++++
core/src/main/resources/application.conf | 4 --
.../io/prediction/workflow/CreateServer.scala | 47 +++++++++++------
.../prediction/tools/dashboard/Dashboard.scala | 37 ++++++++-----
9 files changed, 178 insertions(+), 34 deletions(-)
----------------------------------------------------------------------