You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2015/02/19 19:51:44 UTC
[4/5] incubator-tinkerpop git commit: Merge remote-tracking branch
'origin/master'
Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/2e11ac85
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/2e11ac85
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/2e11ac85
Branch: refs/heads/master
Commit: 2e11ac85ac281a39a6cac77f039194783c61f2f1
Parents: d46ec9e 37f9256
Author: Stephen Mallette <sp...@apache.org>
Authored: Thu Feb 19 13:30:58 2015 -0500
Committer: Stephen Mallette <sp...@apache.org>
Committed: Thu Feb 19 13:30:58 2015 -0500
----------------------------------------------------------------------
.../graph/traversal/ElementTraversal.java | 4 +-
.../process/graph/traversal/GraphTraversal.java | 124 +++++++++++--
.../gremlin/process/graph/traversal/__.java | 4 +-
.../traversal/step/map/GroupCountStep.java | 164 ++++++++++++++++++
.../sideEffect/GroupCountSideEffectStep.java | 172 +++++++++++++++++++
.../step/sideEffect/GroupCountStep.java | 104 -----------
.../mapreduce/GroupCountMapReduce.java | 101 -----------
.../step/util/ReducingBarrierStep.java | 2 +-
.../step/map/GroovyCoalesceTest.groovy | 4 +-
.../traversal/step/map/GroovySelectTest.groovy | 16 +-
.../graph/traversal/step/map/CoalesceTest.java | 2 +-
.../graph/traversal/step/map/SelectTest.java | 20 +--
.../process/traversal/CoreTraversalTest.java | 2 +-
.../groovy/plugin/HadoopGremlinPlugin.java | 10 +-
14 files changed, 479 insertions(+), 250 deletions(-)
----------------------------------------------------------------------