Merge branch 'TINKERPOP-1530' into tp32
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/dc39759c Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/dc39759c Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/dc39759c Branch: refs/heads/TINKERPOP-1562 Commit: dc39759cd9bb6970371540a70cb26a088d8a2dc2 Parents: 47d72ff 185670f Author: Stephen Mallette <[email protected]> Authored: Tue Nov 22 06:35:12 2016 -0500 Committer: Stephen Mallette <[email protected]> Committed: Tue Nov 22 06:35:12 2016 -0500 ---------------------------------------------------------------------- CHANGELOG.asciidoc | 1 + docs/src/dev/io/graphson.asciidoc | 4 +- .../upgrade/release-3.2.x-incubating.asciidoc | 10 +++ .../archetype-resources/src/main/java/App.java | 2 +- .../src/main/java/Service.java | 2 +- .../src/test/java/ServiceTest.java | 2 +- .../SingleGremlinScriptEngineManager.java | 7 ++ .../gremlin/structure/io/IoRegistry.java | 2 +- .../gremlin/structure/io/gryo/GryoPool.java | 23 ++++- .../gremlin/structure/io/IoXIoRegistry.java | 2 +- .../gremlin/structure/io/IoYIoRegistry.java | 2 +- .../structure/io/gryo/GryoMapperTest.java | 12 +-- .../ser/AbstractGryoMessageSerializerV1d0.java | 4 +- .../driver/ser/AbstractMessageSerializer.java | 26 +++++- .../ser/GryoBaseMessageSerializerV1d0Test.java | 93 ++++++++++++++++++++ .../tinkergraph/structure/TinkerGraph.java | 2 +- .../tinkergraph/structure/TinkerIoRegistry.java | 8 ++ .../structure/TinkerIoRegistryV2d0.java | 8 ++ .../TinkerGraphGraphSONSerializerV2d0Test.java | 4 +- .../tinkergraph/structure/TinkerGraphTest.java | 2 +- 20 files changed, 191 insertions(+), 25 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/dc39759c/CHANGELOG.asciidoc ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/dc39759c/docs/src/upgrade/release-3.2.x-incubating.asciidoc ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/dc39759c/gremlin-archetype/gremlin-archetype-server/src/main/resources/archetype-resources/src/main/java/Service.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/dc39759c/gremlin-archetype/gremlin-archetype-server/src/main/resources/archetype-resources/src/test/java/ServiceTest.java ----------------------------------------------------------------------
