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 14:24:54 UTC
[16/16] incubator-tinkerpop git commit: Merge remote-tracking branch
'origin/TINKERPOP3-885'
Merge remote-tracking branch 'origin/TINKERPOP3-885'
Conflicts:
docs/src/upgrade-release-3.1.x-incubating.asciidoc
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/8f2e2e55
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/8f2e2e55
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/8f2e2e55
Branch: refs/heads/master
Commit: 8f2e2e5558af61676ec64b330ec2245abed19209
Parents: 82b2695 6b532f7
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Nov 9 08:05:22 2015 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon Nov 9 08:05:22 2015 -0500
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
docs/src/the-graph.asciidoc | 3 +
.../upgrade-release-3.1.x-incubating.asciidoc | 32 +++++++-
.../util/AbstractThreadLocalTransaction.java | 40 +++++++++-
.../util/AbstractThreadedTransaction.java | 44 +++++++++-
.../structure/util/AbstractTransaction.java | 54 +++++--------
.../server/GremlinDriverIntegrateTest.java | 7 +-
.../gremlin/structure/TransactionTest.java | 84 ++++++++++++++++++++
8 files changed, 223 insertions(+), 42 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/8f2e2e55/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --cc CHANGELOG.asciidoc
index c18129c,87bf9a3..144c018
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@@ -25,9 -25,9 +25,10 @@@ image::https://raw.githubusercontent.co
TinkerPop 3.1.0 (NOT OFFICIALLY RELEASED YET)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ * `Transaction` settings for `onReadWrite` and `onClose` are now `ThreadLocal` in nature of standard transactions.
* Optimized `BulkLoaderVertexProgram`. It now uses `EventStrategy` to monitor what the underlying `BulkLoader` implementation does (e.g. whether it creates a new vertex or returns an existing).
* Integrated `NumberHelper` in `SumStep`, `MinStep`, `MaxStep` and `MeanStep` (local and global step variants).
+* Gremlin Console remoting to Gremlin Server now supports a configuration option for assigning aliases.
* `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.
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/8f2e2e55/docs/src/upgrade-release-3.1.x-incubating.asciidoc
----------------------------------------------------------------------