From commits-return-36661-archive-asf-public=cust-asf.ponee.io@tinkerpop.apache.org Fri Jun 28 15:32:29 2019 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [207.244.88.153]) by mx-eu-01.ponee.io (Postfix) with SMTP id 6CC3018062B for ; Fri, 28 Jun 2019 17:32:29 +0200 (CEST) Received: (qmail 70894 invoked by uid 500); 28 Jun 2019 15:32:28 -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 70885 invoked by uid 99); 28 Jun 2019 15:32:28 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 28 Jun 2019 15:32:28 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 47AB687AD8; Fri, 28 Jun 2019 15:32:25 +0000 (UTC) Date: Fri, 28 Jun 2019 15:32:25 +0000 To: "commits@tinkerpop.apache.org" Subject: [tinkerpop] 01/01: Merge pull request #1129 from apache/TINKERPOP-1084 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit From: dkuppitz@apache.org In-Reply-To: <156173594469.21033.10948110310942512734@gitbox.apache.org> References: <156173594469.21033.10948110310942512734@gitbox.apache.org> X-Git-Host: gitbox.apache.org X-Git-Repo: tinkerpop X-Git-Refname: refs/heads/tp33 X-Git-Reftype: branch X-Git-Rev: 5f05bf164a2a575d11471ebc4e5daf6fa777ee3e X-Git-NotificationType: diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated Message-Id: <20190628153225.47AB687AD8@gitbox.apache.org> This is an automated email from the ASF dual-hosted git repository. dkuppitz pushed a commit to branch tp33 in repository https://gitbox.apache.org/repos/asf/tinkerpop.git commit 5f05bf164a2a575d11471ebc4e5daf6fa777ee3e Merge: 59445da 9a6bf66 Author: Daniel Kuppitz AuthorDate: Fri Jun 28 08:32:20 2019 -0700 Merge pull request #1129 from apache/TINKERPOP-1084 TINKERPOP-1084 Branch option tokens should be allowed to be traversals CHANGELOG.asciidoc | 1 + docs/src/upgrade/release-3.3.x.asciidoc | 30 +++++ .../traversal/lambda/PredicateTraversal.java | 68 ++++++++++ .../process/traversal/step/branch/BranchStep.java | 139 +++++++++++---------- .../process/traversal/step/branch/ChooseStep.java | 10 +- .../process/traversal/step/branch/UnionStep.java | 2 +- gremlin-test/features/branch/Branch.feature | 37 +++++- .../process/traversal/step/ComplexTest.java | 46 ++++++- .../process/traversal/step/branch/BranchTest.java | 47 +++++++ .../tinkergraph/structure/TinkerGraphPlayTest.java | 26 +++- 10 files changed, 323 insertions(+), 83 deletions(-)