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/05 22:31:15 UTC

[10/12] incubator-tinkerpop git commit: Merge remote-tracking branch 'origin/TINKERPOP3-913'

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


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

Branch: refs/heads/TINKERPOP3-923
Commit: c2c58a749de0383b4695559e2b77cd11300b07d3
Parents: e30b70e 986bc70
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Nov 5 12:03:28 2015 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Nov 5 12:03:28 2015 -0500

----------------------------------------------------------------------
 CHANGELOG.asciidoc                              |  1 +
 docs/src/gremlin-applications.asciidoc          | 18 ++---
 .../upgrade-release-3.1.x-incubating.asciidoc   | 14 +++-
 .../apache/tinkerpop/gremlin/driver/Client.java | 71 ++++++++++++++++++--
 .../apache/tinkerpop/gremlin/driver/Tokens.java |  6 ++
 .../handler/HttpGremlinEndpointHandler.java     | 47 ++++++++++---
 .../server/op/standard/StandardOpProcessor.java | 20 ++++--
 .../server/GremlinDriverIntegrateTest.java      | 29 +++++---
 .../server/GremlinServerHttpIntegrateTest.java  | 38 +++++++++--
 .../server/GremlinServerIntegrateTest.java      | 27 +++++++-
 10 files changed, 224 insertions(+), 47 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c2c58a74/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --cc CHANGELOG.asciidoc
index 9f0e18e,b91ac0c..010142e
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@@ -29,8 -28,8 +29,9 @@@ TinkerPop 3.1.0 (NOT OFFICIALLY RELEASE
  * Integrated `NumberHelper` in `SumStep`, `MinStep`, `MaxStep` and `MeanStep` (local and global step variants).
  * `CountMatchAlgorithm`, in OLAP, now biases traversal selection towards those traversals that start at the current traverser location to reduce message passing.
  * Fixed a file stream bug in Hadoop OLTP that showed up if the streamed file was more than 2G of data.
 +* Added the ability to set thread local properties in `SparkGraphComputer` when using a persistent context.
  * Bumped to Neo4j 2.3.0.
+ * Deprecated "rebindings" as an argument to Gremlin Server and replaced it with "aliases".
  * Added `PersistedInputRDD` and `PersistedOutputRDD` which enables `SparkGraphComputer` to store the graph RDD in the context between jobs (no HDFS serialization required).
  * Renamed the `public static String` configuration variable names of TinkerGraph (deprecated old variables).
  * Added `GraphComputer.configure(key,value)` to allow engine-specific configurations.