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/12/15 23:59:15 UTC
[36/44] incubator-tinkerpop git commit: Merge remote-tracking branch
'origin/TINKERPOP-930'
Merge remote-tracking branch 'origin/TINKERPOP-930'
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/e3042c09
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/e3042c09
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/e3042c09
Branch: refs/heads/TINKERPOP-1035
Commit: e3042c09b9eb0ae4d4df7cc9a8902eb67b84cef8
Parents: 32e6d28 8b3af12
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Dec 14 12:27:36 2015 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon Dec 14 12:27:36 2015 -0500
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
.../src/reference/gremlin-applications.asciidoc | 8 +++
.../upgrade/release-3.1.x-incubating.asciidoc | 12 ++++-
gremlin-server/conf/gremlin-server-classic.yaml | 1 +
gremlin-server/conf/gremlin-server-min.yaml | 1 +
.../conf/gremlin-server-modern-readonly.yaml | 1 +
gremlin-server/conf/gremlin-server-modern.yaml | 1 +
gremlin-server/conf/gremlin-server-neo4j.yaml | 1 +
.../conf/gremlin-server-rest-modern.yaml | 1 +
.../conf/gremlin-server-rest-secure.yaml | 1 +
gremlin-server/conf/gremlin-server-secure.yaml | 1 +
gremlin-server/conf/gremlin-server-spark.yaml | 1 +
gremlin-server/conf/gremlin-server.yaml | 1 +
.../tinkerpop/gremlin/server/GraphManager.java | 46 ++++++++++++++++
.../tinkerpop/gremlin/server/Settings.java | 9 ++++
.../gremlin/server/channel/HttpChannelizer.java | 2 +-
.../handler/HttpGremlinEndpointHandler.java | 37 ++++++++++---
.../server/op/AbstractEvalOpProcessor.java | 30 ++++++-----
.../server/op/session/SessionOpProcessor.java | 1 -
.../server/op/standard/StandardOpProcessor.java | 27 +++++++---
.../server/GremlinDriverIntegrateTest.java | 55 ++++++++++++++++++++
.../server/GremlinServerHttpIntegrateTest.java | 36 +++++++++++++
.../server/gremlin-server-integration.yaml | 1 +
.../server/gremlin-server-performance.yaml | 1 +
24 files changed, 244 insertions(+), 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/e3042c09/CHANGELOG.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/e3042c09/docs/src/upgrade/release-3.1.x-incubating.asciidoc
----------------------------------------------------------------------
diff --cc docs/src/upgrade/release-3.1.x-incubating.asciidoc
index dd6b2af,dcc9b4e..3a89509
--- a/docs/src/upgrade/release-3.1.x-incubating.asciidoc
+++ b/docs/src/upgrade/release-3.1.x-incubating.asciidoc
@@@ -453,4 -461,4 +461,4 @@@ longer apply to all future requests. I
that one request. If the settings are changed from an in-session request they will only apply to all future requests
made in the scope of that session.
- See: link:https://issues.apache.org/jira/browse/TINKERPOP-885[TINKERPOP-885]
-See: link:https://issues.apache.org/jira/browse/TINKERPOP3-885[TINKERPOP3-885]
++See: link:https://issues.apache.org/jira/browse/TINKERPOP-885[TINKERPOP-885]