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 2015/12/15 23:59:01 UTC

[22/44] incubator-tinkerpop git commit: Merge remote-tracking branch 'origin/TINKERPOP-1035'

Merge remote-tracking branch 'origin/TINKERPOP-1035'

Conflicts:
	CHANGELOG.asciidoc


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

Branch: refs/heads/TINKERPOP-1035
Commit: 5a9ba5f416dc79b3087aabd7a0e4de94e7d15731
Parents: e1d949b dbc7f94
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Dec 9 11:31:50 2015 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Dec 9 11:31:50 2015 -0500

----------------------------------------------------------------------
 CHANGELOG.asciidoc                              |  1 +
 .../src/reference/gremlin-applications.asciidoc | 29 +++++++++
 .../upgrade/release-3.1.x-incubating.asciidoc   | 17 ++++++
 .../gremlin/groovy/engine/GremlinExecutor.java  |  1 -
 .../server/op/AbstractEvalOpProcessor.java      | 63 +++++++++++++++-----
 .../gremlin/server/op/session/Session.java      |  1 -
 .../server/GremlinDriverIntegrateTest.java      |  4 +-
 7 files changed, 97 insertions(+), 19 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/5a9ba5f4/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --cc CHANGELOG.asciidoc
index d61d8db,589851d..5ebd2de
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@@ -26,11 -26,10 +26,12 @@@ image::https://raw.githubusercontent.co
  TinkerPop 3.1.1 (NOT OFFICIALLY RELEASED YET)
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  
 +* Fixed a `SparkGraphComputer` sorting bug in MapReduce that occurred when there was more than one partition.
  * Fixed a `NullPointerException` bug in `PeerPressureVertexProgram` that occurred when an adjacency traversal was not provided.
+ * Improved Transaction Management consistency in Gremlin Server.
 -* Fixed a long standing issue around having to use `reduceByKey()` on input data to Spark. It is no longer required.
 +* Fixed a long standing "view merge" issue requiring `reduceByKey()` on input data to Spark. It is no longer required.
  * Added `Spark` static object to allow "file system" control of persisted RDDs in Spark.
 +* Added a Spark "job server" to ensure that persisted RDDs are not garbage collected by Spark.
  * Improved logging control during builds with Maven.
  * Fixed settings that weren't being passed to the the Gremlin Driver `Cluster` through configuration file.
  * `Column` now implements `Function`. The modulator `by(valueDecr)` can be replaced by `by(values,decr)` and thus, projection and order are separated.

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/5a9ba5f4/docs/src/upgrade/release-3.1.x-incubating.asciidoc
----------------------------------------------------------------------