Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 5EB59200D0A for ; Tue, 19 Sep 2017 14:27:19 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 5D6F71609DB; Tue, 19 Sep 2017 12:27:19 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id A39A81609E0 for ; Tue, 19 Sep 2017 14:27:18 +0200 (CEST) Received: (qmail 50453 invoked by uid 500); 19 Sep 2017 12:27:17 -0000 Mailing-List: contact commits-help@tinkerpop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@tinkerpop.apache.org Delivered-To: mailing list commits@tinkerpop.apache.org Received: (qmail 50438 invoked by uid 99); 19 Sep 2017 12:27:17 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 19 Sep 2017 12:27:17 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 208F6F57EE; Tue, 19 Sep 2017 12:27:17 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: spmallette@apache.org To: commits@tinkerpop.apache.org Date: Tue, 19 Sep 2017 12:27:19 -0000 Message-Id: In-Reply-To: <0cca9b925e714bb1946308fd55cfdccd@git.apache.org> References: <0cca9b925e714bb1946308fd55cfdccd@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/4] tinkerpop git commit: Merge branch 'TINKERPOP-1779' into tp32 archived-at: Tue, 19 Sep 2017 12:27:19 -0000 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 Authored: Tue Sep 19 06:49:34 2017 -0400 Committer: Stephen Mallette 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).