From commits-return-30127-archive-asf-public=cust-asf.ponee.io@tinkerpop.apache.org Mon Jun 18 22:06:56 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id AFF88180663 for ; Mon, 18 Jun 2018 22:06:55 +0200 (CEST) Received: (qmail 77120 invoked by uid 500); 18 Jun 2018 20:06:54 -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 77103 invoked by uid 99); 18 Jun 2018 20:06:54 -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; Mon, 18 Jun 2018 20:06:54 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B2908E090E; Mon, 18 Jun 2018 20:06:54 +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: Mon, 18 Jun 2018 20:06:55 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/2] tinkerpop git commit: Merge branch 'tp32' into tp33 Merge branch 'tp32' into tp33 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/5d71dc1c Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/5d71dc1c Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/5d71dc1c Branch: refs/heads/tp33 Commit: 5d71dc1c50d7ba2404a058f5be56fb1da8108583 Parents: ba82a5c a4e087d Author: Stephen Mallette Authored: Mon Jun 18 16:06:26 2018 -0400 Committer: Stephen Mallette Committed: Mon Jun 18 16:06:26 2018 -0400 ---------------------------------------------------------------------- gremlin-python/src/main/jython/tests/conftest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5d71dc1c/gremlin-python/src/main/jython/tests/conftest.py ----------------------------------------------------------------------