From commits-return-36616-archive-asf-public=cust-asf.ponee.io@tinkerpop.apache.org Tue Jun 25 19:34:23 2019 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 [207.244.88.153]) by mx-eu-01.ponee.io (Postfix) with SMTP id 2636F18062F for ; Tue, 25 Jun 2019 21:34:23 +0200 (CEST) Received: (qmail 16671 invoked by uid 500); 25 Jun 2019 19:34:22 -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 16662 invoked by uid 99); 25 Jun 2019 19:34:22 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 25 Jun 2019 19:34:22 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id BCFB187ADA; Tue, 25 Jun 2019 19:34:18 +0000 (UTC) Date: Tue, 25 Jun 2019 19:34:20 +0000 To: "commits@tinkerpop.apache.org" Subject: [tinkerpop] 02/03: Merge branch 'tp33' into tp34 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit From: spmallette@apache.org In-Reply-To: <156149125852.16541.18156393573186019753@gitbox.apache.org> References: <156149125852.16541.18156393573186019753@gitbox.apache.org> X-Git-Host: gitbox.apache.org X-Git-Repo: tinkerpop X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Rev: 342df7db97b15b03a9b5cce9aae6c54dd1061585 X-Git-NotificationType: diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated Message-Id: <20190625193418.BCFB187ADA@gitbox.apache.org> This is an automated email from the ASF dual-hosted git repository. spmallette pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tinkerpop.git commit 342df7db97b15b03a9b5cce9aae6c54dd1061585 Merge: d0d32fa 15a5ae1 Author: Stephen Mallette AuthorDate: Tue Jun 25 15:33:56 2019 -0400 Merge branch 'tp33' into tp34 CHANGELOG.asciidoc | 1 + .../main/java/org/apache/tinkerpop/gremlin/driver/Connection.java | 5 ++++- .../java/org/apache/tinkerpop/gremlin/driver/ConnectionPool.java | 8 ++++---- .../main/java/org/apache/tinkerpop/gremlin/driver/Handler.java | 2 +- 4 files changed, 10 insertions(+), 6 deletions(-)