You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by dk...@apache.org on 2019/06/28 15:35:18 UTC
[tinkerpop] branch master updated (3cc807b -> 534746b)
This is an automated email from the ASF dual-hosted git repository.
dkuppitz pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git.
from 3cc807b Merge branch 'tp34'
add 9a6bf66 TINKERPOP-1084 Allow predicates and traversals to be used as options in `BranchStep`.
add 5f05bf1 Merge pull request #1129 from apache/TINKERPOP-1084
new 4471cc5 Merge branch 'tp33' into tp34
new 534746b Merge branch 'tp34'
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
CHANGELOG.asciidoc | 1 +
docs/src/upgrade/release-3.3.x.asciidoc | 30 +++++
...{LoopTraversal.java => PredicateTraversal.java} | 40 +++---
.../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 | 6 +
10 files changed, 263 insertions(+), 95 deletions(-)
copy gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/lambda/{LoopTraversal.java => PredicateTraversal.java} (57%)
[tinkerpop] 02/02: Merge branch 'tp34'
Posted by dk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dkuppitz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit 534746b6019d0775e628375a3dfeba8a18df90fe
Merge: 3cc807b 4471cc5
Author: Daniel Kuppitz <da...@hotmail.com>
AuthorDate: Fri Jun 28 08:35:04 2019 -0700
Merge branch 'tp34'
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 | 6 +
10 files changed, 309 insertions(+), 77 deletions(-)
[tinkerpop] 01/02: Merge branch 'tp33' into tp34
Posted by dk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dkuppitz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit 4471cc5f5da5a927c2f4dfa38e3c67a241eb7e7e
Merge: 761dc05 5f05bf1
Author: Daniel Kuppitz <da...@hotmail.com>
AuthorDate: Fri Jun 28 08:34:45 2019 -0700
Merge branch 'tp33' into tp34
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 | 6 +
10 files changed, 309 insertions(+), 77 deletions(-)