Merge branch 'TINKERPOP-1779' into tp32
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/cb99ddb3
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/cb99ddb3
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/cb99ddb3
Branch: refs/heads/master
Commit: cb99ddb3cec02820e6500dd4ab7f38250826673a
Parents: 05f4f59 e9801e6
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Sep 19 06:49:34 2017 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Sep 19 06:49:34 2017 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
giraph-gremlin/pom.xml | 14 +
gremlin-console/pom.xml | 14 +
gremlin-dotnet/glv/generate.groovy | 220 +++++++++++++++
gremlin-dotnet/pom.xml | 216 +-------------
.../appsettings.json | 4 +-
gremlin-dotnet/test/pom.xml | 79 ++----
gremlin-groovy-test/pom.xml | 14 +
gremlin-groovy/pom.xml | 14 +
.../glv/GraphTraversalSource.template | 102 +++++++
gremlin-python/glv/TraversalSource.template | 282 +++++++++++++++++++
gremlin-python/glv/generate.groovy | 94 +++++++
gremlin-python/pom.xml | 166 +++--------
.../resources/GraphTraversalSource.template | 102 -------
.../src/main/resources/TraversalSource.template | 282 -------------------
.../gremlin/python/driver/credentials.kryo | Bin 138 -> 0 bytes
.../python/driver/generate-modern.groovy | 33 ---
.../driver/gremlin-server-modern-secure-py.yaml | 63 -----
.../driver/tinkergraph-credentials.properties | 22 --
.../python/driver/tinkergraph-empty.properties | 18 --
.../tinkerpop/gremlin/server/Settings.java | 3 +-
.../gremlin/server/util/MetricManager.java | 5 +-
.../src/test/scripts/test-server-start.groovy | 49 ++++
.../src/test/scripts/test-server-stop.groovy | 32 +++
hadoop-gremlin/pom.xml | 14 +
pom.xml | 16 +-
spark-gremlin/pom.xml | 14 +
27 files changed, 946 insertions(+), 927 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/cb99ddb3/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --cc CHANGELOG.asciidoc
index 2b526df,4e64fd6..453552a
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@@ -26,10 -26,9 +26,11 @@@ image::https://raw.githubusercontent.co
TinkerPop 3.2.7 (Release Date: NOT OFFICIALLY RELEASED YET)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ * Bump to GMavenPlus 1.6.
+* Added better error message for illegal use of `repeat()`-step.
* Bump to Jackson 2.8.10.
* Added an `EmbeddedRemoteConnection` so that it's possible to mimic a remote
connection within the same JVM.
+* Supported interruption for remote traversals.
* The Console's `plugin.txt` file is only updated if there were manually
uninstalled plugins.
* Fixed a bug in `MatchStep` where mid-traversal `where()` variables were not
being considered in start-scope.
* Generalized `MatchStep` to locally compute all clauses with barriers (not
just reducing barriers).
