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 3E311200CC8 for ; Fri, 14 Jul 2017 18:05:05 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 3CC0516DB11; Fri, 14 Jul 2017 16:05:05 +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 A718216DB25 for ; Fri, 14 Jul 2017 18:05:04 +0200 (CEST) Received: (qmail 69079 invoked by uid 500); 14 Jul 2017 16:05:03 -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 69060 invoked by uid 99); 14 Jul 2017 16:05:03 -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; Fri, 14 Jul 2017 16:05:03 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id F4175E97F4; Fri, 14 Jul 2017 16:05:02 +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: Fri, 14 Jul 2017 16:05:04 -0000 Message-Id: In-Reply-To: <5d9d33bc92294fbc9c1ee1335ac55c08@git.apache.org> References: <5d9d33bc92294fbc9c1ee1335ac55c08@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/3] tinkerpop git commit: Merge branch 'tp32' archived-at: Fri, 14 Jul 2017 16:05:05 -0000 Merge branch 'tp32' Conflicts: gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ProfileTest.java Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/1de84f87 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/1de84f87 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/1de84f87 Branch: refs/heads/master Commit: 1de84f8740d83b3752d649ab411fda1386e478cb Parents: 4f7b563 04d4e90 Author: Stephen Mallette Authored: Fri Jul 14 12:04:49 2017 -0400 Committer: Stephen Mallette Committed: Fri Jul 14 12:04:49 2017 -0400 ---------------------------------------------------------------------- CHANGELOG.asciidoc | 1 + .../process/traversal/step/map/ProfileTest.java | 34 +++++++++++++++----- 2 files changed, 27 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1de84f87/CHANGELOG.asciidoc ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1de84f87/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ProfileTest.java ----------------------------------------------------------------------