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 2015/11/09 14:24:41 UTC
[03/16] incubator-tinkerpop git commit: removed typos
removed typos
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/285bd28b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/285bd28b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/285bd28b
Branch: refs/heads/master
Commit: 285bd28b523da9eacb8e84f270a0ebf906f6ca91
Parents: 5b0dd76
Author: Dylan Millikin <dy...@brightzone.fr>
Authored: Wed Oct 21 14:34:43 2015 +0200
Committer: Dylan Millikin <dy...@brightzone.fr>
Committed: Wed Oct 21 14:34:43 2015 +0200
----------------------------------------------------------------------
docs/src/upgrade-release-3.1.x-incubating.asciidoc | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/285bd28b/docs/src/upgrade-release-3.1.x-incubating.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/upgrade-release-3.1.x-incubating.asciidoc b/docs/src/upgrade-release-3.1.x-incubating.asciidoc
index 4dd1673..d031b2d 100644
--- a/docs/src/upgrade-release-3.1.x-incubating.asciidoc
+++ b/docs/src/upgrade-release-3.1.x-incubating.asciidoc
@@ -39,6 +39,7 @@ Important Changes
* Entire TinkerGraph instances can be serialized over Gryo.
* Hadoop1 support has been dropped. Hadoop2 is now supported. Giraph 1.1.0 is now supported and Spark of Hadoop2 YARN.
* The implementation and semantics of `GraphTraversal.group()` has changed. The previous model is deprecated and renamed to `groupV3d0()`.
+* `Transaction.onReadWrite()` and `Transaction.onClose()` are now `ThreadLocal` settings
Please see the link:https://github.com/apache/incubator-tinkerpop/blob/3.1.0-incubating/CHANGELOG.asciidoc#XXXXXXXXXXXXXXXXXXXXXXXXXXXX[changelog] for a complete list of all the modifications that are part of this release.
@@ -57,7 +58,6 @@ to closing where a user must now explicitly call `commit()` to persist their mut
See link:https://issues.apache.org/jira/browse/TINKERPOP3-805[TINKERPOP3-805] for more information.
-<<<<<<< HEAD
Transaction.onReadWrite() and Transaction.onClose() are now `ThreadLocal` settings
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -66,7 +66,8 @@ For gremlin-server users that may be changing these settings via scripts :
If the settings are changed from a sessionless request they will now only apply to that one request.
If the settings are changed from an in-session request they will now only apply to all future requests made in the scope of that session.
-=======
+See link:https://issues.apache.org/jira/browse/TINKERPOP3-885[TINKERPOP3-885]
+
Gremlin Process
^^^^^^^^^^^^^^^
@@ -100,7 +101,6 @@ Hadoop-Gremlin Updates
* Hadoop1 is no longer supported. Hadoop2 is now the only supported Hadoop version in TinkerPop.
* The directory where application jars are stored in HDFS is now `hadoop-gremlin-x.y.z-libs`.
** This versioning is important so that cross-version TinkerPop use does not cause jar conflicts.
->>>>>>> master
Upgrading for Providers
~~~~~~~~~~~~~~~~~~~~~~~
@@ -121,7 +121,6 @@ If these tests were referenced in an `OptOut`, then their names should be update
See link:https://issues.apache.org/jira/browse/TINKERPOP3-805[TINKERPOP3-805] for more information.
-<<<<<<< HEAD
Driver Implementers
^^^^^^^^^^^^^^^^^^^
@@ -131,9 +130,8 @@ Transaction.onReadWrite() and Transaction.onClose() are now `ThreadLocal` settin
If your driver configures the `Transaction.onReadWrite()` or `Transaction.onClose()` settings, note that these no longer apply to all future requests.
If the settings are changed from a sessionless request they will only apply to that one request.
If the settings are changed from an in-session request they will only apply to all future requests made in the scope of that session.
-=======
+
Graph Traversal Updates
+++++++++++++++++++++++
There were numerous changes to the `GraphTraversal` API. Nearly all changes are backwards compatible with respective "deprecated" annotations. Please review the respective updates specified in the "Graph System Users" section.
->>>>>>> master