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 2018/07/19 17:41:40 UTC
[21/50] tinkerpop git commit: Merge branch 'tp33'
Merge branch 'tp33'
Conflicts:
giraph-gremlin/src/test/resources/log4j-silent.properties
giraph-gremlin/src/test/resources/log4j-test.properties
hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/HadoopGraphProvider.java
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/ea6884a3
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/ea6884a3
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/ea6884a3
Branch: refs/heads/TINKERPOP-1996
Commit: ea6884a38f65193d544a2de24b41e50c8a4e2a3b
Parents: db2b3c5 4639758
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Jul 17 05:52:28 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Jul 17 05:52:28 2018 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
docs/src/dev/developer/development-environment.asciidoc | 1 +
gremlin-core/src/test/resources/log4j-silent.properties | 5 +++--
gremlin-core/src/test/resources/log4j-test.properties | 3 ++-
.../java/org/apache/tinkerpop/gremlin/TestHelper.java | 11 ++++++++++-
.../tinkerpop/gremlin/structure/io/IoIntegrateTest.java | 2 +-
.../structure/util/detached/DetachedGraphTest.java | 2 +-
.../gremlin/structure/util/star/StarGraphTest.java | 2 +-
gremlin-test/src/test/resources/log4j-silent.properties | 5 ++++-
gremlin-test/src/test/resources/log4j-test.properties | 5 ++++-
.../src/test/resources/log4j-silent.properties | 5 ++++-
hadoop-gremlin/src/test/resources/log4j-test.properties | 5 ++++-
.../gremlin/neo4j/AbstractNeo4jGraphProvider.java | 3 ++-
neo4j-gremlin/src/test/resources/log4j-silent.properties | 5 ++++-
neo4j-gremlin/src/test/resources/log4j-test.properties | 5 ++++-
spark-gremlin/src/test/resources/log4j-silent.properties | 5 ++++-
spark-gremlin/src/test/resources/log4j-test.properties | 5 ++++-
.../tinkergraph/process/TinkerGraphComputerProvider.java | 3 ++-
.../src/test/resources/log4j-silent.properties | 5 ++++-
.../src/test/resources/log4j-test.properties | 5 ++++-
20 files changed, 64 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ea6884a3/CHANGELOG.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ea6884a3/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/AbstractNeo4jGraphProvider.java
----------------------------------------------------------------------