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:20 UTC

[2/3] tinkerpop git commit: Merge branch 'TINKERPOP-1365' into tp32

Merge branch 'TINKERPOP-1365' into tp32


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/6c6ab324
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/6c6ab324
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/6c6ab324

Branch: refs/heads/tp33
Commit: 6c6ab324b62d66b15393e22d6f77b5628dd2d564
Parents: 6fd3036 38f4036
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Jul 16 15:58:41 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon Jul 16 15:58:41 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    |  5 ++++-
 .../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 |  4 ++--
 .../src/test/resources/log4j-silent.properties           |  5 ++++-
 .../src/test/resources/log4j-test.properties             |  5 ++++-
 23 files changed, 76 insertions(+), 22 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6c6ab324/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --cc CHANGELOG.asciidoc
index a25e7a5,4099411..f50b9ec
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@@ -30,12 -29,10 +30,13 @@@ image::https://raw.githubusercontent.co
  * Fixed bug in `branch()` where reducing steps as options would produce incorrect results.
  * Removed recursive handling of streaming results from Gremlin-Python driver to avoid max recursion depth errors.
  * Improved performance of `TraversalVertexProgram` and related infrastructure.
 +* Deprecated `BulkLoaderVertexProgram` and related infrastructure.
 +* Deprecated `BulkDumperVertexProgram` with the more aptly named `CloneVertexProgram`.
  * Added `createGratefulDead()`to `TinkerFactory` to help make it easier to try to instantiate that toy graph.
  * Added identifiers to edges in the Kitchen Sink toy graph.
 +* Ordered the loading of plugins in the Gremlin Console by their position in the configuration file.
  * Refactored the Gremlin Server integration testing framework and streamlined that infrastructure.
+ * Logged the seed used in initializing `Random` for tests.
  * Fixed bug in `GroovyTranslator` that didn't properly handle empty `Map` objects.
  * Added concrete configuration methods to `SparkGraphComputer` to make a more clear API for configuring it.
  * Fixed a bug in `TinkerGraphCountStrategy`, which didn't consider that certain map steps may not emit an element.