Merge branch 'master' into TINKERPOP-1310
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/7255844c Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/7255844c Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/7255844c Branch: refs/heads/master Commit: 7255844c03fc1b6d447a2631250100758c4f84cb Parents: 3978e7b 6113c92 Author: Marko A. Rodriguez <okramma...@gmail.com> Authored: Wed May 25 12:25:51 2016 -0600 Committer: Marko A. Rodriguez <okramma...@gmail.com> Committed: Wed May 25 12:25:51 2016 -0600 ---------------------------------------------------------------------- CHANGELOG.asciidoc | 1 + .../process/traversal/step/map/GroupStep.java | 307 ++++++++++++------- .../step/sideEffect/GroupSideEffectStep.java | 61 ++-- .../step/sideEffect/GroovyGroupTest.groovy | 10 + .../traversal/step/sideEffect/GroupTest.java | 77 +++++ .../gremlin/hadoop/structure/HadoopGraph.java | 124 ++++++-- .../SparkStarBarrierInterceptor.java | 1 - .../structure/TinkerGraphPlayTest.java | 4 +- 8 files changed, 390 insertions(+), 195 deletions(-) ----------------------------------------------------------------------
