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 2018/11/19 16:24:28 UTC

[tinkerpop] branch master updated (a60a2b9 -> 8dc9ebc)

This is an automated email from the ASF dual-hosted git repository.

spmallette pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git.


    from a60a2b9  Merge pull request #992 from apache/TINKERPOP-2079
     add eb63dfe  TINKERPOP-2092 Deprecated default serializer fields
     new 8dc9ebc  Merge branch 'tp33'

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 +
 .../tinkerpop/gremlin/driver/ser/Serializers.java  |  6 +++++
 .../handler/NioGremlinBinaryRequestDecoder.java    |  6 ++---
 .../handler/{Frame.java => ServerSerializers.java} | 29 ++++++++--------------
 .../tinkerpop/gremlin/server/handler/StateKey.java |  5 +++-
 .../server/handler/WebSocketHandlerUtil.java       |  3 ++-
 .../handler/WsGremlinBinaryRequestDecoder.java     |  3 +--
 .../handler/WsGremlinCloseRequestDecoder.java      |  3 +--
 .../handler/WsGremlinTextRequestDecoder.java       |  3 +--
 9 files changed, 29 insertions(+), 30 deletions(-)
 copy gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/{Frame.java => ServerSerializers.java} (62%)


[tinkerpop] 01/01: Merge branch 'tp33'

Posted by 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 8dc9ebcb9d707e11b29bd7efc954b17dc49c4e1e
Merge: a60a2b9 eb63dfe
Author: Stephen Mallette <sp...@genoprime.com>
AuthorDate: Mon Nov 19 11:24:01 2018 -0500

    Merge branch 'tp33'

 CHANGELOG.asciidoc                                 |  1 +
 .../tinkerpop/gremlin/driver/ser/Serializers.java  |  6 +++++
 .../handler/NioGremlinBinaryRequestDecoder.java    |  6 ++---
 ...cketHandlerUtil.java => ServerSerializers.java} | 27 +++++++++++-----------
 .../tinkerpop/gremlin/server/handler/StateKey.java |  5 +++-
 .../server/handler/WebSocketHandlerUtil.java       |  3 ++-
 .../handler/WsGremlinBinaryRequestDecoder.java     |  3 +--
 .../handler/WsGremlinCloseRequestDecoder.java      |  3 +--
 .../handler/WsGremlinTextRequestDecoder.java       |  3 +--
 9 files changed, 33 insertions(+), 24 deletions(-)

diff --cc gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/WebSocketHandlerUtil.java
index 26711c2,ab04b8c..ee37e44
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/WebSocketHandlerUtil.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/WebSocketHandlerUtil.java
@@@ -20,11 -20,12 +20,12 @@@ package org.apache.tinkerpop.gremlin.se
  
  import io.netty.handler.codec.http.HttpMessage;
  
 -import static io.netty.handler.codec.http.HttpHeaders.Names.UPGRADE;
 -import static io.netty.handler.codec.http.HttpHeaders.Names.CONNECTION;
 +import static io.netty.handler.codec.http.HttpHeaderNames.UPGRADE;
 +import static io.netty.handler.codec.http.HttpHeaderNames.CONNECTION;
  
  /**
-  * A class to handle common WebSocket operations
+  * A class to handle common WebSocket operations.
+  *
   * @author Keith Lohnes lohnesk@gmail.com
   */
  final class WebSocketHandlerUtil {