(tinkerpop) 02/03: Merge branch '3.6-dev' into 3.7-dev

[sp...@apache.org]

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 dc6e715775710b56c75613e145bf591aa6ecbc19
Merge: edec67ff15 a37e93f3c3
Author: Stephen Mallette <st...@amazon.com>
AuthorDate: Wed Jun 19 07:23:41 2024 -0400

    Merge branch '3.6-dev' into 3.7-dev

 CHANGELOG.asciidoc                                                    | 1 +
 .../src/main/java/org/apache/tinkerpop/gremlin/driver/Client.java     | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --cc gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Client.java
index 7ce5c404d3,fe5d3275fb..b53f1cddbb
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Client.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Client.java
@@@ -18,13 -18,11 +18,14 @@@
   */
  package org.apache.tinkerpop.gremlin.driver;
  
+ import io.netty.handler.codec.http.websocketx.WebSocketClientHandshakeException;
  import org.apache.commons.lang3.exception.ExceptionUtils;
 +import org.apache.tinkerpop.gremlin.util.Tokens;
 +import org.slf4j.Logger;
 +import org.slf4j.LoggerFactory;
  import org.apache.tinkerpop.gremlin.driver.exception.ConnectionException;
  import org.apache.tinkerpop.gremlin.driver.exception.NoHostAvailableException;
 -import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
 +import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
  import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
  import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
  import org.apache.tinkerpop.gremlin.process.traversal.TraversalSource;