Merge branch 'TINKERPOP-999'
Conflicts:
CHANGELOG.asciidoc
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/d3ecef82
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/d3ecef82
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/d3ecef82
Branch: refs/heads/TINKERPOP-1682
Commit: d3ecef82e306718b8c80391541d314349b11258f
Parents: 7346806 67cd592
Author: Stephen Mallette <[email protected]>
Authored: Fri Jun 23 06:33:31 2017 -0400
Committer: Stephen Mallette <[email protected]>
Committed: Fri Jun 23 06:33:31 2017 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
.../gremlin/server/AbstractChannelizer.java | 4 +-
.../tinkerpop/gremlin/server/Channelizer.java | 3 +-
.../tinkerpop/gremlin/server/GremlinServer.java | 42 ++----------
.../gremlin/server/channel/HttpChannelizer.java | 4 +-
.../gremlin/server/channel/NioChannelizer.java | 3 +-
.../server/channel/WebSocketChannelizer.java | 3 +-
.../server/util/ServerGremlinExecutor.java | 70 ++++++--------------
8 files changed, 32 insertions(+), 98 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d3ecef82/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --cc CHANGELOG.asciidoc
index 8be7e42,ba591c2..f6fcfff
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@@ -33,12 -32,7 +33,13 @@@ TinkerPop 3.3.0 (Release Date: NOT OFFI
* Added "attachment requisite" `VertexProperty.element()` and
`Property.element()` data in GraphSON serialization.
* GraphSON 3.0 is now the default serialization format in TinkerGraph and
Gremlin Server.
* Established the GraphSON 3.0 format.
+* Removed previously deprecated `Io.Builder#registry(IoRegistry)` method.
+* Removed previously deprecated `GryoMessageSerializerV1d0(GryoMapper)`
constructor.
+* Removed previously deprecated `TinkerIoRegistry`.
+* Removed previously deprecated `getInstance()` methods on all TinkerPop
classes.
+* Removed previously deprecated
`VertexPropertyFeatures.supportsAddProperty()`.
+* Removed previously deprecated TinkerGraph configuration member variables.
+ * Changed `ServerGremlinExecutor` to not use generics since there really is
no flexibility in the kind of `ScheduledExecutorService` that will be used.
* Removed previously deprecated `OpSelectorHandler.errorMeter` and
`AbstractEvalOpProcessor.errorMeter` fields.
* Removed previously deprecated `AbstractEvalOpProcessor.validBindingName`
field.
* Removed previously deprecated
`SimpleAuthenticator.CONFIG_CREDENTIALS_LOCATION` field.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d3ecef82/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GremlinServer.java
----------------------------------------------------------------------
