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 9652A200C46 for ; Wed, 29 Mar 2017 16:12:22 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 946131626A4; Wed, 29 Mar 2017 14:12:22 +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 76FBD1626A9 for ; Wed, 29 Mar 2017 16:12:21 +0200 (CEST) Received: (qmail 65112 invoked by uid 500); 29 Mar 2017 14:12:20 -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 65064 invoked by uid 99); 29 Mar 2017 14:12:20 -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; Wed, 29 Mar 2017 14:12:20 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 83493E93D8; Wed, 29 Mar 2017 14:12:20 +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: Wed, 29 Mar 2017 14:12:27 -0000 Message-Id: <84fe407dea114625bf7dea8f83daa26f@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [8/8] tinkerpop git commit: Merge branch 'TINKERPOP-1654-tp32' into tp32 archived-at: Wed, 29 Mar 2017 14:12:22 -0000 Merge branch 'TINKERPOP-1654-tp32' into tp32 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/1b6ad3c2 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/1b6ad3c2 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/1b6ad3c2 Branch: refs/heads/tp32 Commit: 1b6ad3c2dc04d924a747560bded3fed8d22fa473 Parents: 0f5ca93 ad268ef Author: Stephen Mallette Authored: Wed Mar 29 10:11:40 2017 -0400 Committer: Stephen Mallette Committed: Wed Mar 29 10:11:40 2017 -0400 ---------------------------------------------------------------------- .../structure/io/graphson/GraphSONTypeDeserializer.java | 2 +- .../gremlin/structure/io/graphson/GraphSONTypeIdResolver.java | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) ----------------------------------------------------------------------