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 2017/07/14 16:12:02 UTC

[2/3] tinkerpop git commit: Merge branch 'TINKERPOP-1718' into tp32

Merge branch 'TINKERPOP-1718' into tp32


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/42c3f407
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/42c3f407
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/42c3f407

Branch: refs/heads/master
Commit: 42c3f4077a15d8fe981c84b37f7e99f9241e0c02
Parents: 04d4e90 f97a21c
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Fri Jul 14 12:05:57 2017 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Fri Jul 14 12:05:57 2017 -0400

----------------------------------------------------------------------
 CHANGELOG.asciidoc                                              | 1 +
 docs/src/reference/gremlin-applications.asciidoc                | 1 -
 docs/src/reference/gremlin-variants.asciidoc                    | 1 -
 .../gremlin/driver/ser/GryoLiteMessageSerializerV1d0.java       | 3 +++
 .../tinkerpop/gremlin/driver/ser/GryoMessageSerializerV1d0.java | 2 --
 .../gremlin/python/driver/gremlin-server-modern-secure-py.yaml  | 1 -
 gremlin-server/conf/gremlin-server-classic.yaml                 | 1 -
 gremlin-server/conf/gremlin-server-modern-py.yaml               | 1 -
 gremlin-server/conf/gremlin-server-modern-readonly.yaml         | 1 -
 gremlin-server/conf/gremlin-server-modern.yaml                  | 1 -
 gremlin-server/conf/gremlin-server-neo4j.yaml                   | 1 -
 gremlin-server/conf/gremlin-server-secure.yaml                  | 1 -
 gremlin-server/conf/gremlin-server-spark.yaml                   | 1 -
 gremlin-server/conf/gremlin-server.yaml                         | 1 -
 .../apache/tinkerpop/gremlin/server/AbstractChannelizer.java    | 5 +++--
 15 files changed, 7 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/42c3f407/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --cc CHANGELOG.asciidoc
index f36fe33,582af8f..1d57828
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@@ -28,9 -28,8 +28,10 @@@ TinkerPop 3.2.6 (Release Date: NOT OFFI
  
  This release also includes changes from <<release-3-1-8, 3.1.8>>.
  
 +* `ProfileTest` is now less stringent about assertions which will reduce burdens on providers.
 +* `GremlinExecutor` begins timeout of script evaluation at the time the script was submitted and not from the time it began evaluation.
  * `ReferenceFactory` and `DetachedFactory` now detach elements in collections accordingly.
+ * Deprecated `GryoLiteMessageSerializerV1d0` in favor of `HaltedTraverserStrategy`.
  * Deprecated the `useMapperFromGraph` configuration option for Gremlin Server serializers.
  * `JavaTranslator` is now smart about handling `BulkSet` and `Tree`.
  * Added annotations to the traversal metrics pretty print.

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/42c3f407/docs/src/reference/gremlin-applications.asciidoc
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/42c3f407/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/AbstractChannelizer.java
----------------------------------------------------------------------