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 22222200CEC for ; Mon, 31 Jul 2017 18:03:23 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 20E8E16576D; Mon, 31 Jul 2017 16:03:23 +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 6FE4B16576B for ; Mon, 31 Jul 2017 18:03:22 +0200 (CEST) Received: (qmail 91618 invoked by uid 500); 31 Jul 2017 16:03:21 -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 91601 invoked by uid 99); 31 Jul 2017 16:03:21 -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, 31 Jul 2017 16:03:21 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 8CB99E96B7; Mon, 31 Jul 2017 16:03:21 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dkuppitz@apache.org To: commits@tinkerpop.apache.org Date: Mon, 31 Jul 2017 16:03:22 -0000 Message-Id: <8b7f795dcfdb4421b4663a62de797718@git.apache.org> In-Reply-To: <688fdc33906a45a4a32d3539d77b17d4@git.apache.org> References: <688fdc33906a45a4a32d3539d77b17d4@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] tinkerpop git commit: Merge branch 'tp31' into tp32 archived-at: Mon, 31 Jul 2017 16:03:23 -0000 Merge branch 'tp31' into tp32 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/f02fab9c Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/f02fab9c Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/f02fab9c Branch: refs/heads/tp32 Commit: f02fab9c6f6c7e8f05efc163c03ee9b3313253f0 Parents: d92dd5d 3d8c03b Author: Daniel Kuppitz Authored: Mon Jul 31 18:02:27 2017 +0200 Committer: Daniel Kuppitz Committed: Mon Jul 31 18:02:27 2017 +0200 ---------------------------------------------------------------------- .../traversal/step/sideEffect/GroovySackTest.groovy | 2 +- .../process/traversal/step/sideEffect/SackTest.java | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f02fab9c/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroovySackTest.groovy ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f02fab9c/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SackTest.java ---------------------------------------------------------------------- diff --cc gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SackTest.java index 3bde60d,7903b07..7012478 --- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SackTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SackTest.java @@@ -69,11 -67,9 +69,11 @@@ public abstract class SackTest extends public abstract Traversal get_g_withBulkXfalseX_withSackX1_sumX_V_out_barrier_sack(); + public abstract Traversal get_g_withBulkXfalseX_withSackX1_sumX_VX1X_localXoutEXknowsX_barrierXnormSackX_inVX_inXknowsX_barrier_sack(final Object v1Id); + public abstract Traversal get_g_withSackXBigInteger_TEN_powX1000X_assignX_V_localXoutXknowsX_barrierXnormSackXX_inXknowsX_barrier_sack(); - public abstract Traversal get_g_withSackX2X_V_sackXdivX_byXconstantXBigDecimal_valueOfX3XXX_sack(); + public abstract Traversal get_g_withSackX2X_V_sackXdivX_byXconstantX3_0XX_sack(); @Test @LoadGraphWith(MODERN)