Merge branch 'TINKERPOP-1877-master'
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/12479c66 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/12479c66 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/12479c66 Branch: refs/heads/master Commit: 12479c66e32a5865ca7f3b23bb1d34462a6cf22f Parents: f5d67e4 eacaf10 Author: Stephen Mallette <sp...@genoprime.com> Authored: Thu Feb 8 11:02:34 2018 -0500 Committer: Stephen Mallette <sp...@genoprime.com> Committed: Thu Feb 8 11:02:34 2018 -0500 ---------------------------------------------------------------------- CHANGELOG.asciidoc | 1 + .../upgrade/release-3.2.x-incubating.asciidoc | 24 ++++++- .../gremlin/util/TinkerGraphProvider.java | 2 + 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-v1d0.json | 1 + .../io/graphson/tinkerpop-sink-typed-v2d0.json | 1 + .../io/graphson/tinkerpop-sink-v1d0.json | 1 + .../io/graphson/tinkerpop-sink-v2d0.json | 1 + .../io/graphson/tinkerpop-sink-v3d0.json | 1 + .../structure/io/gryo/tinkerpop-sink-v3d0.kryo | Bin 0 -> 79 bytes .../gremlin/hadoop/HadoopGraphProvider.java | 8 ++- .../tinkergraph/structure/TinkerFactory.java | 15 +++++ .../tinkergraph/TinkerGraphProvider.java | 2 + .../structure/IoDataGenerationTest.java | 64 +++++++++++++++++++ 19 files changed, 166 insertions(+), 15 deletions(-) ----------------------------------------------------------------------
