Merge branch 'TINKERPOP-1691' into tp32
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/a104680d Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/a104680d Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/a104680d Branch: refs/heads/TINKERPOP-1489 Commit: a104680d3eb0fa5c73855407d1fb2fd76fae1f72 Parents: 46cd072 3035af1 Author: Stephen Mallette <[email protected]> Authored: Fri Jun 23 06:20:03 2017 -0400 Committer: Stephen Mallette <[email protected]> Committed: Fri Jun 23 06:20:03 2017 -0400 ---------------------------------------------------------------------- CHANGELOG.asciidoc | 1 + .../decoration/EventStrategyProcessTest.java | 28 ++++++++++---------- 2 files changed, 15 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a104680d/CHANGELOG.asciidoc ---------------------------------------------------------------------- diff --cc CHANGELOG.asciidoc index e08ec3e,fcc97bc..7a69469 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@@ -28,9 -28,9 +28,10 @@@ TinkerPop 3.2.6 (Release Date: NOT OFFI This release also includes changes from <<release-3-1-8, 3.1.8>>. +* Added annotations to the traversal metrics pretty print. * Fixed `HADOOP_GREMLIN_LIBS` parsing for Windows. * Improved GraphSON serialization performance around `VertexProperty`. + * Changed some tests in `EventStrategyProcessTest` which were enforcing some unintended semantics around transaction state. [[release-3-2-5]] TinkerPop 3.2.5 (Release Date: June 12, 2017)
