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 c6839775e129514cb35fc7e461da704461e87e5f
Merge: 366d5e4 c0605b3
Author: Stephen Mallette <[email protected]>
AuthorDate: Wed Dec 29 17:46:46 2021 -0500

    Merge branch '3.5-dev'

 .../tinkerpop/gremlin/server/GremlinServerSessionIntegrateTest.java  | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --cc 
gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerSessionIntegrateTest.java
index bf3c767,50f5bf8..0521511
--- 
a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerSessionIntegrateTest.java
+++ 
b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerSessionIntegrateTest.java
@@@ -35,14 -34,11 +35,13 @@@ import org.apache.tinkerpop.gremlin.dri
  import org.apache.tinkerpop.gremlin.server.channel.UnifiedChannelizer;
  import org.apache.tinkerpop.gremlin.server.op.session.Session;
  import org.apache.tinkerpop.gremlin.server.op.session.SessionOpProcessor;
 -import org.apache.tinkerpop.gremlin.util.Log4jRecordingAppender;
  import org.junit.After;
 +import org.junit.AfterClass;
  import org.junit.Before;
 +import org.junit.BeforeClass;
  import org.junit.Test;
 +import org.slf4j.LoggerFactory;
  
- import java.io.File;
  import java.util.ArrayList;
  import java.util.HashMap;
  import java.util.List;

Reply via email to