Merge branch 'master' into TINKERPOP-1307
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/4318b6c4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/4318b6c4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/4318b6c4 Branch: refs/heads/master Commit: 4318b6c4c8a005117590cfc1e861d1a88ad4c068 Parents: 085be94 afd4048 Author: Marko A. Rodriguez <[email protected]> Authored: Wed May 25 08:43:24 2016 -0600 Committer: Marko A. Rodriguez <[email protected]> Committed: Wed May 25 08:43:24 2016 -0600 ---------------------------------------------------------------------- CHANGELOG.asciidoc | 1 + .../traversal/step/sideEffect/SubgraphStep.java | 19 ++++++---- .../step/sideEffect/GroovySubgraphTest.groovy | 5 +++ .../traversal/step/sideEffect/SubgraphTest.java | 40 ++++++++++++++++++-- 4 files changed, 53 insertions(+), 12 deletions(-) ----------------------------------------------------------------------
