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 2016/03/25 17:53:58 UTC
[24/24] incubator-tinkerpop git commit: Merge branch 'master' into
TINKERPOP-1236
Merge branch 'master' into TINKERPOP-1236
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/bb06ee5a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/bb06ee5a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/bb06ee5a
Branch: refs/heads/TINKERPOP-1236
Commit: bb06ee5a6f2347fd0495485bbbaaedf5e049a438
Parents: 7a52aa4 29d267f
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Fri Mar 25 10:53:21 2016 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Fri Mar 25 10:53:21 2016 -0600
----------------------------------------------------------------------
CHANGELOG.asciidoc | 5 +-
gremlin-console/src/main/bin/gremlin.sh | 23 ++-
.../tinkerpop/gremlin/console/Console.groovy | 7 +-
.../tinkerpop/gremlin/console/ConsoleFs.groovy | 30 ++++
.../tinkerpop/gremlin/console/Mediator.groovy | 11 +-
.../console/commands/InstallCommand.groovy | 4 +-
gremlin-console/src/main/static/NOTICE | 3 +-
.../traversal/TraversalVertexProgram.java | 2 +-
.../step/map/TraversalVertexProgramStep.java | 10 --
.../decoration/VertexProgramStrategy.java | 150 +++++++++++++++++++
.../gremlin/process/remote/RemoteGraph.java | 2 +-
.../remote/traversal/step/map/RemoteStep.java | 2 +-
.../traversal/strategy/RemoteStrategy.java | 96 ------------
.../strategy/decoration/RemoteStrategy.java | 96 ++++++++++++
.../process/traversal/TraversalSource.java | 2 +-
.../process/traversal/step/TraversalParent.java | 8 -
.../process/traversal/step/util/EmptyStep.java | 10 --
.../decoration/RequirementsStrategy.java | 1 +
.../decoration/VertexProgramStrategy.java | 150 -------------------
.../finalization/MatchAlgorithmStrategy.java | 10 +-
.../strategy/finalization/ProfileStrategy.java | 4 +-
.../ComputerVerificationStrategy.java | 2 +-
.../process/traversal/util/TraversalHelper.java | 9 ++
.../structure/io/graphson/GraphSONModule.java | 4 +-
.../io/graphson/GraphSONSerializers.java | 38 +++++
.../gremlin/structure/util/StringFactory.java | 2 +-
.../traversal/step/TraversalParentTest.java | 79 ----------
.../decoration/VertexProgramStrategyTest.java | 1 +
.../process/util/TraversalHelperTest.java | 50 +++++++
.../tinkerpop/gremlin/driver/Connection.java | 5 +-
...raphSONMessageSerializerGremlinV1d0Test.java | 36 ++++-
.../ser/GraphSONMessageSerializerV1d0Test.java | 42 ++++++
gremlin-server/src/main/static/NOTICE | 2 +-
.../driver/remote/RemoteGraphProvider.java | 5 +-
.../server/GremlinDriverIntegrateTest.java | 21 +++
.../src/test/resources/log4j-test.properties | 4 +-
gremlin-shaded/pom.xml | 2 +-
.../gremlin/structure/SerializationTest.java | 76 +++++++++-
.../groovy/plugin/HadoopRemoteAcceptor.java | 2 +-
pom.xml | 2 +-
40 files changed, 607 insertions(+), 401 deletions(-)
----------------------------------------------------------------------