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/25 15:59:44 UTC
[2/2] incubator-tinkerpop git commit: Merge branch 'master' into
sideeffect-reduce
Merge branch 'master' into sideeffect-reduce
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/4befd1de
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/4befd1de
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/4befd1de
Branch: refs/heads/master
Commit: 4befd1debe58e03b971ec5834e78326bbd6ebcef
Parents: 83ebad7 960eeb5
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Mon Feb 23 21:41:03 2015 +0100
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Mon Feb 23 21:41:03 2015 +0100
----------------------------------------------------------------------
CHANGELOG.asciidoc | 2 +-
gremlin-console/bin/gremlin.sh | 3 +-
.../graph/traversal/step/map/TreeStep.java | 52 +++++++++-----------
.../sideEffect/GroupCountSideEffectStep.java | 6 +--
.../step/sideEffect/TreeSideEffectStep.java | 20 ++++++--
.../step/util/ReducingBarrierStep.java | 4 +-
.../util/metric/DependantMutableMetrics.java | 5 ++
.../process/util/metric/MutableMetrics.java | 2 +-
.../gremlin/structure/io/kryo/KryoMapper.java | 6 ++-
.../step/sideEffect/GroovyProfileTest.groovy | 9 ++--
.../traversal/step/sideEffect/ProfileTest.java | 35 +++++++------
11 files changed, 80 insertions(+), 64 deletions(-)
----------------------------------------------------------------------