Merge branch 'TINKERPOP-1877' into tp32
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/4e284c02 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/4e284c02 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/4e284c02 Branch: refs/heads/master Commit: 4e284c026c5753e32b5d3c662eee5d78d0f4c1b4 Parents: 9a7a998 5f67d9c Author: Stephen Mallette <sp...@genoprime.com> Authored: Thu Feb 8 11:02:16 2018 -0500 Committer: Stephen Mallette <sp...@genoprime.com> Committed: Thu Feb 8 11:02:16 2018 -0500 ---------------------------------------------------------------------- CHANGELOG.asciidoc | 1 + data/tinkerpop-sink-typed.json | 1 + data/tinkerpop-sink-v2d0-typed.json | 1 + data/tinkerpop-sink-v2d0.json | 1 + data/tinkerpop-sink.json | 1 + data/tinkerpop-sink.kryo | Bin 0 -> 76 bytes .../upgrade/release-3.2.x-incubating.asciidoc | 24 ++++++++- .../step/branch/GroovyRepeatTest.groovy | 5 ++ gremlin-server/scripts/generate-all.groovy | 6 ++- .../driver/remote/RemoteGraphProvider.java | 7 +-- .../remote/gremlin-server-integration.yaml | 3 +- .../apache/tinkerpop/gremlin/LoadGraphWith.java | 16 +++++- .../apache/tinkerpop/gremlin/TestHelper.java | 3 +- .../traversal/step/branch/RepeatTest.java | 25 ++++++++- .../io/graphson/tinkerpop-sink-typed.json | 1 + .../io/graphson/tinkerpop-sink-v2d0-typed.json | 1 + .../io/graphson/tinkerpop-sink-v2d0.json | 1 + .../structure/io/graphson/tinkerpop-sink.json | 1 + .../structure/io/gryo/tinkerpop-sink.kryo | Bin 0 -> 76 bytes .../gremlin/hadoop/HadoopGraphProvider.java | 10 ++-- .../tinkergraph/structure/TinkerFactory.java | 15 ++++++ .../tinkergraph/TinkerGraphProvider.java | 2 + .../structure/IoDataGenerationTest.java | 53 +++++++++++++++++++ 23 files changed, 162 insertions(+), 16 deletions(-) ----------------------------------------------------------------------
