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 8F1A9200CD1 for ; Tue, 11 Jul 2017 14:45:15 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 8DE57162956; Tue, 11 Jul 2017 12:45:15 +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 2A1B01628D1 for ; Tue, 11 Jul 2017 14:45:13 +0200 (CEST) Received: (qmail 5767 invoked by uid 500); 11 Jul 2017 12:45:12 -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 5687 invoked by uid 99); 11 Jul 2017 12:45:11 -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, 11 Jul 2017 12:45:11 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id E8905DFC26; Tue, 11 Jul 2017 12:45:10 +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, 11 Jul 2017 12:45:32 -0000 Message-Id: <783cd91940b2449ba115a502884aec46@git.apache.org> In-Reply-To: <07bd2bd1cdc146698ec09b1c8fb78880@git.apache.org> References: <07bd2bd1cdc146698ec09b1c8fb78880@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [23/50] [abbrv] tinkerpop git commit: Merge branch 'tp32' archived-at: Tue, 11 Jul 2017 12:45:15 -0000 Merge branch 'tp32' Conflicts: gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/AbstractChannelizer.java Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/22e2d9d9 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/22e2d9d9 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/22e2d9d9 Branch: refs/heads/TINKERPOP-1686 Commit: 22e2d9d9037fdfc0218a0e6e4d81bdf250fa7160 Parents: 3477dc7 402678b Author: Stephen Mallette Authored: Thu Jul 6 10:18:25 2017 -0400 Committer: Stephen Mallette Committed: Thu Jul 6 10:18:25 2017 -0400 ---------------------------------------------------------------------- ----------------------------------------------------------------------