You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2015/11/30 23:03:16 UTC

[2/2] incubator-tinkerpop git commit: Merge remote-tracking branch 'origin/TINKERPOP3-981'

Merge remote-tracking branch 'origin/TINKERPOP3-981'


Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/a54b72c7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/a54b72c7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/a54b72c7

Branch: refs/heads/master
Commit: a54b72c7885667fd315e92de80d26b5d9e0c09bd
Parents: e14019b 0f4ad25
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Nov 30 17:02:38 2015 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon Nov 30 17:02:38 2015 -0500

----------------------------------------------------------------------
 .../src/reference/gremlin-applications.asciidoc |  19 +-
 .../conf/gremlin-server-rest-secure.yaml        |   3 +-
 gremlin-server/conf/gremlin-server-secure.yaml  |   3 +-
 .../conf/tinkergraph-credentials.properties     |  20 ++
 .../server/auth/SimpleAuthenticator.java        |  30 ++-
 .../GremlinServerAuthIntegrateOldTest.java      | 235 +++++++++++++++++++
 .../server/GremlinServerAuthIntegrateTest.java  |   4 +-
 .../server/GremlinServerHttpIntegrateTest.java  |  49 ++++
 8 files changed, 329 insertions(+), 34 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/a54b72c7/docs/src/reference/gremlin-applications.asciidoc
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/a54b72c7/gremlin-server/conf/gremlin-server-rest-secure.yaml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/a54b72c7/gremlin-server/conf/gremlin-server-secure.yaml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/a54b72c7/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerHttpIntegrateTest.java
----------------------------------------------------------------------