You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2017/08/25 19:13:43 UTC
[6/9] tinkerpop git commit: Merge branch 'tp32'

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/Gremlin.Net/Gremlin.Net.csproj
	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/0377ab59
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/0377ab59
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/0377ab59

Branch: refs/heads/master
Commit: 0377ab59e77cdb36c09427faf5ac08524d2ffbc2
Parents: 4314cca 0048591
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Fri Aug 25 14:51:32 2017 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Fri Aug 25 14:51:32 2017 -0400

----------------------------------------------------------------------
 CHANGELOG.asciidoc         | 6 ++++++
 gremlin-dotnet/src/pom.xml | 3 +++
 gremlin-python/pom.xml     | 2 +-
 3 files changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0377ab59/CHANGELOG.asciidoc
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0377ab59/gremlin-dotnet/src/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0377ab59/gremlin-python/pom.xml
----------------------------------------------------------------------