Merge branch 'pr-548' into tp32
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/ed1cc29f Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/ed1cc29f Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/ed1cc29f Branch: refs/heads/TINKERPOP-1599 Commit: ed1cc29f599eabd9ac1394f9a9d1f0211c9000c5 Parents: 9aacdea 0203176 Author: Stephen Mallette <[email protected]> Authored: Thu Feb 2 09:48:31 2017 -0500 Committer: Stephen Mallette <[email protected]> Committed: Thu Feb 2 09:48:31 2017 -0500 ---------------------------------------------------------------------- .../process/traversal/step/map/EdgeVertexStep.java | 7 ++++++- .../gremlin/process/traversal/step/map/FlatMapStep.java | 7 +++++++ .../gremlin/process/traversal/step/map/GraphStep.java | 8 +++----- .../process/traversal/step/map/PropertiesStep.java | 7 ++++++- .../gremlin/process/traversal/step/map/VertexStep.java | 7 ++++++- .../gremlin/structure/util/CloseableIterator.java | 11 +++++++++++ 6 files changed, 39 insertions(+), 8 deletions(-) ----------------------------------------------------------------------
