You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by ok...@apache.org on 2015/10/28 20:21:11 UTC
[47/50] [abbrv] incubator-tinkerpop git commit: Merge remote-tracking
branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Conflicts:
docs/src/upgrade-release-3.1.x-incubating.asciidoc
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/1b6bdf1f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/1b6bdf1f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/1b6bdf1f
Branch: refs/heads/TINKERPOP3-857
Commit: 1b6bdf1fdea4115c80aa4a5555bc0d4d819ce8e4
Parents: ca00e35 fad7e5b
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Oct 28 11:38:12 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Oct 28 11:38:12 2015 -0400
----------------------------------------------------------------------
.../upgrade-release-3.1.x-incubating.asciidoc | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/1b6bdf1f/docs/src/upgrade-release-3.1.x-incubating.asciidoc
----------------------------------------------------------------------
diff --cc docs/src/upgrade-release-3.1.x-incubating.asciidoc
index a1ae8b5,b9eca4e..9a7d34f
--- a/docs/src/upgrade-release-3.1.x-incubating.asciidoc
+++ b/docs/src/upgrade-release-3.1.x-incubating.asciidoc
@@@ -89,15 -96,7 +101,8 @@@ Gremlin-Groovy Update
* The closure wrappers classes `GFunction`, `GSupplier`, `GConsumer` have been deprecated.
** In Groovy, a closure can be specified using `as Function` and thus, these wrappers are not needed.
+* The `GremlinExecutor.promoteBindings()` method which was previously deprecated has been removed.
- 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.
-
Upgrading for Providers
~~~~~~~~~~~~~~~~~~~~~~~