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 52A00200C01 for ; Thu, 19 Jan 2017 21:01:26 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 513FB160B57; Thu, 19 Jan 2017 20:01:26 +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 92CAF160B3A for ; Thu, 19 Jan 2017 21:01:25 +0100 (CET) Received: (qmail 49527 invoked by uid 500); 19 Jan 2017 20:01:24 -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 49518 invoked by uid 99); 19 Jan 2017 20:01:24 -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; Thu, 19 Jan 2017 20:01:24 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B5C40DFCC4; Thu, 19 Jan 2017 20:01:24 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: okram@apache.org To: commits@tinkerpop.apache.org Date: Thu, 19 Jan 2017 20:01:25 -0000 Message-Id: In-Reply-To: <1f5ee85f1f0543fcbff0d93ea3ff3493@git.apache.org> References: <1f5ee85f1f0543fcbff0d93ea3ff3493@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] tinkerpop git commit: Merge branch 'tp32' archived-at: Thu, 19 Jan 2017 20:01:26 -0000 Merge branch 'tp32' Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/bfe432eb Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/bfe432eb Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/bfe432eb Branch: refs/heads/master Commit: bfe432eb8dd0bc06ab335add0919944d21739e54 Parents: 1bc66ab 8ad2911 Author: Marko A. Rodriguez Authored: Thu Jan 19 13:01:18 2017 -0700 Committer: Marko A. Rodriguez Committed: Thu Jan 19 13:01:18 2017 -0700 ---------------------------------------------------------------------- .../process/traversal/step/util/CollectingBarrierStep.java | 4 ++-- .../gremlin/process/traversal/traverser/ProjectedTraverser.java | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) ----------------------------------------------------------------------