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 2017/11/15 12:31:57 UTC
[2/3] tinkerpop git commit: Merge branch 'TINKERPOP-1829' into tp32
Merge branch 'TINKERPOP-1829' into tp32
Conflicts:
CHANGELOG.asciidoc
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/ca215323
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/ca215323
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/ca215323
Branch: refs/heads/master
Commit: ca2153238bb4d62789ab33215890c15c1fdead23
Parents: f3458ee a5f48d9
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Nov 15 07:31:11 2017 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Nov 15 07:31:11 2017 -0500
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
docs/src/reference/the-traversal.asciidoc | 12 +
.../upgrade/release-3.2.x-incubating.asciidoc | 10 +
.../process/traversal/step/filter/DropStep.java | 13 +-
.../process/traversal/step/map/AddEdgeStep.java | 4 +-
.../traversal/step/map/AddVertexStartStep.java | 4 +-
.../traversal/step/map/AddVertexStep.java | 4 +-
.../step/sideEffect/AddPropertyStep.java | 21 +-
.../strategy/decoration/EventStrategy.java | 68 ++
.../util/reference/ReferenceProperty.java | 2 +-
.../util/reference/ReferenceVertexProperty.java | 2 +-
.../decoration/EventStrategyProcessTest.java | 1046 +++++++++++++++++-
12 files changed, 1165 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ca215323/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --cc CHANGELOG.asciidoc
index cd5dc38,3a2b5b5..df00fa5
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@@ -23,7 -23,7 +23,8 @@@ image::https://raw.githubusercontent.co
[[release-3-2-7]]
=== TinkerPop 3.2.7 (Release Date: NOT OFFICIALLY RELEASED YET)
+ * Provided a method to configure detachment options with `EventStrategy`.
+* Fixed a race condition in `TinkerIndex`.
* Fixed an `ArrayOutOfBoundsException` in `hasId()` for the rare situation when the provided collection is empty.
* Bump to Netty 4.0.52
* `TraversalVertexProgram` `profile()` now accounts for worker iteration in `GraphComputer` OLAP.