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/10/09 17:55:10 UTC

[4/4] incubator-tinkerpop git commit: Merge branch 'master' into TINKERPOP3-876

Merge branch 'master' into TINKERPOP3-876


Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/eed4b24c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/eed4b24c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/eed4b24c

Branch: refs/heads/master
Commit: eed4b24c1221860997e94c84b2afd0dbdfdc1dcd
Parents: 92e8c68 10f79af
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Fri Oct 9 09:49:59 2015 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Fri Oct 9 09:49:59 2015 -0600

----------------------------------------------------------------------
 CHANGELOG.asciidoc                              |   3 +
 CONTRIBUTING.asciidoc                           |  18 +++
 bin/validate-distribution.sh                    | 161 +++++++++++++++++++
 .../traversal/dsl/graph/GraphTraversal.java     |   2 +-
 .../gremlin/process/traversal/step/Barrier.java |  35 ++++
 .../traversal/step/filter/DedupGlobalStep.java  |   8 +-
 .../process/traversal/step/map/GroupStep.java   |  19 ++-
 .../traversal/step/map/GroupStepV3d0.java       |  16 +-
 .../step/map/LambdaCollectingBarrierStep.java   |  60 +++++++
 .../step/sideEffect/GroupSideEffectStep.java    |  28 ++--
 .../traversal/step/util/BarrierStep.java        |  28 ----
 .../step/util/CollectingBarrierStep.java        |  13 +-
 .../traversal/step/util/GroupStepHelper.java    |  28 ++--
 .../step/util/LambdaCollectingBarrierStep.java  |  59 -------
 .../step/util/ReducingBarrierStep.java          |  16 +-
 .../step/util/SupplyingBarrierStep.java         |  13 +-
 .../finalization/LazyBarrierStrategy.java       |   2 +-
 .../map/LambdaCollectingBarrierStepTest.java    |  37 +++++
 .../traversal/step/map/MatchStepTest.java       |   1 -
 .../step/util/NoOpBarrierStepTest.java          |  37 -----
 .../tinkerpop/gremlin/driver/Channelizer.java   |  10 +-
 .../apache/tinkerpop/gremlin/driver/Client.java |   5 +-
 .../step/sideEffect/GroovyGroupTest.groovy      |  22 +++
 .../step/sideEffect/GroovyGroupTestV3d0.groovy  |  10 ++
 .../gremlin/groovy/engine/GremlinExecutor.java  | 150 ++++++++++++++++-
 .../groovy/engine/GremlinExecutorTest.java      |  52 +++++-
 gremlin-server/src/assembly/standalone.xml      |  36 +++++
 .../server/GremlinDriverIntegrateTest.java      |  36 ++++-
 .../server/GremlinServerAuthIntegrateTest.java  |  34 +++-
 .../traversal/step/sideEffect/GroupTest.java    |  85 ++++++++++
 .../step/sideEffect/GroupTestV3d0.java          |  40 +++++
 .../gremlin/hadoop/structure/HadoopGraph.java   |  16 ++
 .../structure/TinkerGraphPlayTest.java          |  60 +++++--
 33 files changed, 920 insertions(+), 220 deletions(-)
----------------------------------------------------------------------