Merge branch 'TINKERPOP-1483'
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/686ce61e Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/686ce61e Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/686ce61e Branch: refs/heads/TINKERPOP-1564 Commit: 686ce61e5a57d3865f5915c89fef68842830dfe7 Parents: 4c6e43d 02345aa Author: Daniel Kuppitz <daniel_kupp...@hotmail.com> Authored: Wed Nov 30 17:51:44 2016 +0100 Committer: Daniel Kuppitz <daniel_kupp...@hotmail.com> Committed: Wed Nov 30 17:51:44 2016 +0100 ---------------------------------------------------------------------- CHANGELOG.asciidoc | 1 + docs/src/upgrade/release-3.3.x.asciidoc | 7 ++++ .../traversal/dsl/graph/GraphTraversal.java | 2 +- .../gremlin/process/traversal/dsl/graph/__.java | 2 +- .../traversal/step/map/PropertyMapStep.java | 21 ++++++------ .../step/map/GroovyValueMapTest.groovy | 5 +++ .../process/computer/GraphComputerTest.java | 7 ++-- .../traversal/step/map/ValueMapTest.java | 35 ++++++++++++++++++++ 8 files changed, 65 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/686ce61e/CHANGELOG.asciidoc ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/686ce61e/docs/src/upgrade/release-3.3.x.asciidoc ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/686ce61e/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java ----------------------------------------------------------------------