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 2016/08/25 16:37:36 UTC
[2/2] tinkerpop git commit: Merge remote-tracking branch
'origin/TINKERPOP-1386'
Merge remote-tracking branch 'origin/TINKERPOP-1386'
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/ae1978d5
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/ae1978d5
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/ae1978d5
Branch: refs/heads/master
Commit: ae1978d53496fbe17edd09bc5e63db9a777800fa
Parents: f8c8a73 49dcb61
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Aug 25 11:49:53 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Aug 25 11:49:53 2016 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 3 ++-
gremlin-driver/pom.xml | 2 +-
.../tinkerpop/gremlin/driver/simple/WebSocketClient.java | 10 ++++++----
3 files changed, 9 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ae1978d5/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --cc CHANGELOG.asciidoc
index 5f49bea,54618df..66947ca
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@@ -26,9 -26,8 +26,10 @@@ image::https://raw.githubusercontent.co
TinkerPop 3.2.2 (NOT OFFICIALLY RELEASED YET)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- * Included GraphSON as a default serializer (in addition to Gryo, which was already present) in Gremlin Server if none are defined
+ * Included GraphSON as a default serializer (in addition to Gryo, which was already present) in Gremlin Server if none are defined.
+* Introduced GraphSON 2.0.
+* Deprecated `embedTypes` on the builder for `GraphSONMapper`.
+ * Bumped to Netty 4.0.40.final.
* Defaulted the `gremlinPool` setting in Gremlin Server to be zero, which will instructs it to use `Runtime.availableProcessors()` for that settings.
* Changed scope of log4j dependencies so that they would only be used in tests and the binary distributions of Gremlin Console and Server.
* Deprecated `Io.Builder.registry()` in favor of the newly introduced `Io.Builder.onMapper()`.