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/09 13:59:39 UTC

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

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


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

Branch: refs/heads/master
Commit: d37e62803410dc94fa0298f5fff22e7740ffaf5f
Parents: ed596b1 2c7823e
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Nov 9 07:59:13 2015 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon Nov 9 07:59:13 2015 -0500

----------------------------------------------------------------------
 CHANGELOG.asciidoc                              |  1 +
 docs/src/gremlin-applications.asciidoc          | 27 +++++++++++++
 .../upgrade-release-3.1.x-incubating.asciidoc   | 24 +++++++++++-
 .../groovy/plugin/DriverRemoteAcceptor.java     | 38 +++++++++++++++++--
 .../DriverRemoteAcceptorIntegrateTest.java      |  8 ++++
 .../groovy/plugin/DriverRemoteAcceptorTest.java | 40 ++++++++++++++++++++
 .../apache/tinkerpop/gremlin/driver/Client.java | 24 ++++++++++++
 .../tinkerpop/gremlin/driver/Cluster.java       |  8 ++--
 8 files changed, 160 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/d37e6280/CHANGELOG.asciidoc
----------------------------------------------------------------------

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

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/d37e6280/docs/src/upgrade-release-3.1.x-incubating.asciidoc
----------------------------------------------------------------------
diff --cc docs/src/upgrade-release-3.1.x-incubating.asciidoc
index 5632468,b0601b2..3809dbd
--- a/docs/src/upgrade-release-3.1.x-incubating.asciidoc
+++ b/docs/src/upgrade-release-3.1.x-incubating.asciidoc
@@@ -180,16 -200,3 +200,16 @@@ GraphComputer Update
  This allows the user to specify engine-specific parameters to the underlying OLAP system. These parameters are not intended
  to be cross engine supported. Moreover, if there are not parameters that can be altered (beyond the standard `GraphComputer`
  methods), then the provider's `GraphComputer` implementation should simply return and do nothing.
 +
 +Driver Providers
 +^^^^^^^^^^^^^^^^
 +
 +Aliases Parameter
 ++++++++++++++++++
 +
 +The "rebindings" argument to the "standard" `OpProcessor` has been renamed to "aliases". While "rebindings" is still
 +supported it is recommended that the upgrade to "aliases" be made as soon as possible as support will be removed in
 +the future.  Gremlin Server will not accept both parameters at the same time - a request must contain either one
 +parameter or the other if either is supplied.
 +
- See link:https://issues.apache.org/jira/browse/TINKERPOP3-913[TINKERPOP3-913] for more information.
++See link:https://issues.apache.org/jira/browse/TINKERPOP3-913[TINKERPOP3-913] for more information.

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/d37e6280/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Client.java
----------------------------------------------------------------------