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 C0F5E200CF9 for ; Sun, 3 Sep 2017 02:42:39 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id BDB9A1648AF; Sun, 3 Sep 2017 00:42:39 +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 153C61645AD for ; Sun, 3 Sep 2017 02:42:38 +0200 (CEST) Received: (qmail 28121 invoked by uid 500); 3 Sep 2017 00:42:37 -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 28112 invoked by uid 99); 3 Sep 2017 00:42:37 -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; Sun, 03 Sep 2017 00:42:37 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 6E836F5645; Sun, 3 Sep 2017 00:42:36 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: rdale@apache.org To: commits@tinkerpop.apache.org Date: Sun, 03 Sep 2017 00:42:36 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [01/50] tinkerpop git commit: Merge branch 'tp32' archived-at: Sun, 03 Sep 2017 00:42:39 -0000 Repository: tinkerpop Updated Branches: refs/heads/TINKERPOP-1692 32bb33aaf -> 9b814a566 Merge branch 'tp32' Conflicts: giraph-gremlin/pom.xml gremlin-archetype/gremlin-archetype-dsl/pom.xml gremlin-archetype/gremlin-archetype-server/pom.xml gremlin-archetype/gremlin-archetype-tinkergraph/pom.xml gremlin-archetype/pom.xml gremlin-console/bin/gremlin.sh gremlin-console/pom.xml gremlin-core/pom.xml gremlin-dotnet/pom.xml gremlin-dotnet/src/pom.xml gremlin-dotnet/test/pom.xml gremlin-driver/pom.xml gremlin-groovy-test/pom.xml gremlin-groovy/pom.xml gremlin-python/pom.xml gremlin-server/pom.xml gremlin-shaded/pom.xml gremlin-test/pom.xml gremlin-tools/gremlin-benchmark/pom.xml hadoop-gremlin/pom.xml neo4j-gremlin/pom.xml pom.xml spark-gremlin/pom.xml tinkergraph-gremlin/pom.xml Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/cfcd1ccd Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/cfcd1ccd Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/cfcd1ccd Branch: refs/heads/TINKERPOP-1692 Commit: cfcd1ccd68ba16f4331775ce85e6bc4578cdd36b Parents: 1c64713 17f1dc4 Author: Stephen Mallette Authored: Tue Aug 22 08:37:04 2017 -0400 Committer: Stephen Mallette Committed: Tue Aug 22 08:37:04 2017 -0400 ---------------------------------------------------------------------- docs/src/upgrade/release-3.2.x-incubating.asciidoc | 4 +++- gremlin-groovy-test/pom.xml | 0 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/cfcd1ccd/docs/src/upgrade/release-3.2.x-incubating.asciidoc ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/cfcd1ccd/gremlin-groovy-test/pom.xml ---------------------------------------------------------------------- diff --cc gremlin-groovy-test/pom.xml index 0000000,4c1e7b5..e69de29 mode 000000,100644..100644 --- a/gremlin-groovy-test/pom.xml +++ b/gremlin-groovy-test/pom.xml