You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by ok...@apache.org on 2015/02/19 21:02:44 UTC
[2/6] incubator-tinkerpop git commit: Merge remote-tracking branch
'upstream/master'
Merge remote-tracking branch 'upstream/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/05ceab84
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/05ceab84
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/05ceab84
Branch: refs/heads/master
Commit: 05ceab84e58a18d3bc644e69c5194cdb25eec8d4
Parents: 989c798 5440f49
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Thu Feb 19 19:17:11 2015 +0100
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Thu Feb 19 19:17:11 2015 +0100
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
.../graph/traversal/ElementTraversal.java | 4 +-
.../process/graph/traversal/GraphTraversal.java | 124 +++++++++++--
.../gremlin/process/graph/traversal/__.java | 4 +-
.../traversal/step/map/GroupCountStep.java | 164 ++++++++++++++++++
.../traversal/step/map/MeanGlobalStep.java | 2 +-
.../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 +-
15 files changed, 477 insertions(+), 245 deletions(-)
----------------------------------------------------------------------