Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 33964200BC5 for ; Tue, 22 Nov 2016 12:35:53 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 3240C160B1C; Tue, 22 Nov 2016 11:35:53 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 7BA23160B0C for ; Tue, 22 Nov 2016 12:35:52 +0100 (CET) Received: (qmail 85672 invoked by uid 500); 22 Nov 2016 11:35:51 -0000 Mailing-List: contact commits-help@tinkerpop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@tinkerpop.apache.org Delivered-To: mailing list commits@tinkerpop.apache.org Received: (qmail 85654 invoked by uid 99); 22 Nov 2016 11:35:51 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 22 Nov 2016 11:35:51 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 5B7CEE1772; Tue, 22 Nov 2016 11:35:51 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: spmallette@apache.org To: commits@tinkerpop.apache.org Date: Tue, 22 Nov 2016 11:35:52 -0000 Message-Id: <1d097c95151944bb90c00090263edbbc@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/2] tinkerpop git commit: Merge branch 'TINKERPOP-1530' into tp32 archived-at: Tue, 22 Nov 2016 11:35:53 -0000 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/tp32 Commit: dc39759cd9bb6970371540a70cb26a088d8a2dc2 Parents: 47d72ff 185670f Author: Stephen Mallette Authored: Tue Nov 22 06:35:12 2016 -0500 Committer: Stephen Mallette 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 ----------------------------------------------------------------------