Merge branch 'TINKERPOP-1446'
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/c6c3f0f0
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/c6c3f0f0
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/c6c3f0f0
Branch: refs/heads/TRAVIS-TEST
Commit: c6c3f0f026c6d6e6c9c324c6e48835773a870ba0
Parents: 98ed875 c7bf69d
Author: Stephen Mallette <[email protected]>
Authored: Mon Mar 12 10:11:44 2018 -0400
Committer: Stephen Mallette <[email protected]>
Committed: Mon Mar 12 10:11:44 2018 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
.../gremlin/process/traversal/step/util/EmptyPath.java | 6 ++++++
.../gremlin/process/traversal/step/util/ImmutablePath.java | 3 ++-
.../gremlin/process/traversal/step/util/MutablePath.java | 3 ++-
.../tinkerpop/gremlin/structure/util/StringFactory.java | 9 +++++++--
gremlin-dotnet/src/Gremlin.Net/Structure/Path.cs | 2 +-
.../Structure/IO/GraphSON/GraphSONReaderTests.cs | 4 ++--
.../test/Gremlin.Net.UnitTest/Structure/PathTests.cs | 2 +-
.../javascript/gremlin-javascript/lib/structure/graph.js | 4 ++++
.../src/main/jython/gremlin_python/structure/graph.py | 2 +-
.../src/main/jython/tests/structure/io/test_graphsonV2d0.py | 5 +----
.../src/main/jython/tests/structure/io/test_graphsonV3d0.py | 5 +----
.../src/main/jython/tests/structure/test_graph.py | 2 +-
13 files changed, 30 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c6c3f0f0/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --cc CHANGELOG.asciidoc
index 5a986c6,9ecb5a2..9afe904
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@@ -25,8 -25,7 +25,9 @@@ NEED AND IMAG
This release also includes changes from <<release-3-3-2, 3.3.2>>.
+ * Change the `toString()` of `Path` to be standardized as other graph
elements are.
+* Fixed a bug in `ReducingBarrierStep`, that returned the provided seed value
despite no elements being available.
+* Changed the order of `select()` scopes. The order is now: maps,
side-effects, paths.
== TinkerPop 3.3.0 (Gremlin Symphony #40 in G Minor)
