You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2022/07/15 18:54:52 UTC
[tinkerpop] 04/05: Merge branch '3.5-dev' into 3.6-dev
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit c478381cac979c2663260697512e28ce0e7c8b06
Merge: 61a02b6ec1 137cad03e7
Author: Stephen Mallette <st...@amazon.com>
AuthorDate: Fri Jul 15 14:50:10 2022 -0400
Merge branch '3.5-dev' into 3.6-dev
.../gremlin/process/traversal/translator/GolangTranslator.java | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --cc gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/translator/GolangTranslator.java
index b1209bb89c,75dfd95b2e..25e31a7f5c
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/translator/GolangTranslator.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/translator/GolangTranslator.java
@@@ -21,7 -21,14 +21,15 @@@ package org.apache.tinkerpop.gremlin.pr
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.text.StringEscapeUtils;
- import org.apache.tinkerpop.gremlin.process.traversal.*;
+ import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
+ import org.apache.tinkerpop.gremlin.process.traversal.P;
++import org.apache.tinkerpop.gremlin.process.traversal.Pick;
+ import org.apache.tinkerpop.gremlin.process.traversal.SackFunctions;
+ import org.apache.tinkerpop.gremlin.process.traversal.Script;
++import org.apache.tinkerpop.gremlin.process.traversal.Text;
+ import org.apache.tinkerpop.gremlin.process.traversal.TextP;
+ import org.apache.tinkerpop.gremlin.process.traversal.Translator;
+ import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategy;
-import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalOptionParent;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.TraversalStrategyProxy;
import org.apache.tinkerpop.gremlin.process.traversal.util.ConnectiveP;
import org.apache.tinkerpop.gremlin.process.traversal.util.OrP;