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/17 09:53:21 UTC
[3/3] tinkerpop git commit: Merge branch 'tp32' into tp33
Merge branch 'tp32' into tp33
Conflicts:
gremlin-core/src/test/resources/log4j-silent.properties
gremlin-core/src/test/resources/log4j-test.properties
tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/TinkerGraphComputerProvider.java
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/46397584
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/46397584
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/46397584
Branch: refs/heads/tp33
Commit: 463975846669aa0055f8411b998beff62bb09f8b
Parents: 8bf7a76 6c6ab32
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Jul 16 21:43:23 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon Jul 16 21:43:23 2018 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
docs/src/dev/developer/development-environment.asciidoc | 1 +
.../src/test/resources/log4j-silent.properties | 5 ++++-
giraph-gremlin/src/test/resources/log4j-test.properties | 5 ++++-
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 ++++-
.../tinkerpop/gremlin/hadoop/HadoopGraphProvider.java | 2 +-
.../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 ++++-
23 files changed, 73 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/46397584/CHANGELOG.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/46397584/docs/src/dev/developer/development-environment.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/46397584/gremlin-core/src/test/resources/log4j-silent.properties
----------------------------------------------------------------------
diff --cc gremlin-core/src/test/resources/log4j-silent.properties
index e43797f,2b06ae8..d639ca7
--- a/gremlin-core/src/test/resources/log4j-silent.properties
+++ b/gremlin-core/src/test/resources/log4j-silent.properties
@@@ -20,7 -20,7 +20,8 @@@
log4j.rootLogger=OFF, stdout
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=[%p] %C - %m%n
+log4j.appender.stdout.layout.ConversionPattern=[%p] %C - %m%n
- # need to turn this on as this test uses Random and needs INFO to display the seed used
- log4j.logger.org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalTest=INFO
+ # need to turn this on so that we know the test seed
++log4j.logger.org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalTest=INFO
+ log4j.logger.org.apache.tinkerpop.gremlin.TestHelper=INFO
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/46397584/gremlin-core/src/test/resources/log4j-test.properties
----------------------------------------------------------------------
diff --cc gremlin-core/src/test/resources/log4j-test.properties
index 3cb3d4f,e2e2465..b46385a
--- a/gremlin-core/src/test/resources/log4j-test.properties
+++ b/gremlin-core/src/test/resources/log4j-test.properties
@@@ -18,7 -18,7 +18,8 @@@
log4j.rootLogger=WARN, stdout
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=[%p] %C - %m%n
+log4j.appender.stdout.layout.ConversionPattern=[%p] %C - %m%n
- # need to turn this on as this test uses Random and needs INFO to display the seed used
+ # need to turn this on so that we know the test seed
-log4j.logger.org.apache.tinkerpop.gremlin.TestHelper=INFO
++log4j.logger.org.apache.tinkerpop.gremlin.TestHelper=INFO
+log4j.logger.org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalTest=INFO
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/46397584/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/HadoopGraphProvider.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/46397584/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/TinkerGraphComputerProvider.java
----------------------------------------------------------------------