You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by ly...@apache.org on 2023/06/20 22:22:47 UTC
[tinkerpop] branch 3.6-dev updated (43f12f2d08 -> 36be1a376d)
This is an automated email from the ASF dual-hosted git repository.
lyndonb pushed a change to branch 3.6-dev
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
from 43f12f2d08 Merge branch '3.5-dev' into 3.6-dev
add b449a9c3e1 TINKERPOP-2958 Added cancel for query timeout task when query completes. (#2090)
new 36be1a376d Merge remote-tracking branch 'origin/3.5-dev' into 3.6-dev
The 1 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 +
.../apache/tinkerpop/gremlin/server/Context.java | 23 ++++++++++++++++++++++
.../server/op/session/SessionOpProcessor.java | 13 ++++++++++--
.../server/op/traversal/TraversalOpProcessor.java | 13 ++++++++++--
4 files changed, 46 insertions(+), 4 deletions(-)
[tinkerpop] 01/01: Merge remote-tracking branch 'origin/3.5-dev' into 3.6-dev
Posted by ly...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lyndonb pushed a commit to branch 3.6-dev
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit 36be1a376dc945abd76a8878af239466674383b9
Merge: 43f12f2d08 b449a9c3e1
Author: lyndon <ly...@apache.org>
AuthorDate: Tue Jun 20 15:22:33 2023 -0700
Merge remote-tracking branch 'origin/3.5-dev' into 3.6-dev
CHANGELOG.asciidoc | 1 +
.../apache/tinkerpop/gremlin/server/Context.java | 23 ++++++++++++++++++++++
.../server/op/session/SessionOpProcessor.java | 13 ++++++++++--
.../server/op/traversal/TraversalOpProcessor.java | 13 ++++++++++--
4 files changed, 46 insertions(+), 4 deletions(-)