tinkerpop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rd...@apache.org
Subject [01/50] tinkerpop git commit: Merge branch 'tp32'
Date Sun, 03 Sep 2017 00:42:36 GMT
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 <spmva@genoprime.com>
Authored: Tue Aug 22 08:37:04 2017 -0400
Committer: Stephen Mallette <spmva@genoprime.com>
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


Mime
View raw message