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 A86CD200A5B for ; Wed, 25 May 2016 16:53:24 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id A76FD160A34; Wed, 25 May 2016 14:53:24 +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 ED226160A29 for ; Wed, 25 May 2016 16:53:23 +0200 (CEST) Received: (qmail 23034 invoked by uid 500); 25 May 2016 14:53:23 -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 23024 invoked by uid 99); 25 May 2016 14:53:23 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 25 May 2016 14:53:23 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id 4467DCCEE9 for ; Wed, 25 May 2016 14:48:15 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -4.646 X-Spam-Level: X-Spam-Status: No, score=-4.646 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-1.426] autolearn=disabled Received: from mx2-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id OT_wUHL9Cc4O for ; Wed, 25 May 2016 14:48:14 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx2-lw-eu.apache.org (ASF Mail Server at mx2-lw-eu.apache.org) with SMTP id 59F735FB9E for ; Wed, 25 May 2016 14:48:13 +0000 (UTC) Received: (qmail 88947 invoked by uid 99); 25 May 2016 14:48:12 -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; Wed, 25 May 2016 14:48:12 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 7CC44E0556; Wed, 25 May 2016 14:48:08 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: okram@apache.org To: commits@tinkerpop.incubator.apache.org Date: Wed, 25 May 2016 14:48:13 -0000 Message-Id: <18d04f8cd3c1413daba46a91bbb0a624@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [6/7] incubator-tinkerpop git commit: Merge branch 'master' into TINKERPOP-1307 archived-at: Wed, 25 May 2016 14:53:24 -0000 Merge branch 'master' into TINKERPOP-1307 Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/4318b6c4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/4318b6c4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/4318b6c4 Branch: refs/heads/TINKERPOP-1307 Commit: 4318b6c4c8a005117590cfc1e861d1a88ad4c068 Parents: 085be94 afd4048 Author: Marko A. Rodriguez Authored: Wed May 25 08:43:24 2016 -0600 Committer: Marko A. Rodriguez Committed: Wed May 25 08:43:24 2016 -0600 ---------------------------------------------------------------------- CHANGELOG.asciidoc | 1 + .../traversal/step/sideEffect/SubgraphStep.java | 19 ++++++---- .../step/sideEffect/GroovySubgraphTest.groovy | 5 +++ .../traversal/step/sideEffect/SubgraphTest.java | 40 ++++++++++++++++++-- 4 files changed, 53 insertions(+), 12 deletions(-) ----------------------------------------------------------------------