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/04 15:21:34 UTC
[30/31] incubator-tinkerpop git commit: Merge remote-tracking branch
'origin/master'
Merge remote-tracking branch 'origin/master'
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/3ac67f2c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/3ac67f2c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/3ac67f2c
Branch: refs/heads/TINKERPOP3-860
Commit: 3ac67f2c8295b02b107be8aad2f9661cd8b09e89
Parents: 2b2bf96 04f7e24
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Fri Dec 4 09:09:28 2015 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Fri Dec 4 09:09:28 2015 -0500
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
.../org/apache/tinkerpop/gremlin/structure/Column.java | 11 +++++++----
2 files changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/3ac67f2c/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --cc CHANGELOG.asciidoc
index 1fa03d5,1b2e1d9..9b3fa71
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@@ -26,8 -26,7 +26,9 @@@ image::https://raw.githubusercontent.co
TinkerPop 3.1.1 (NOT OFFICIALLY RELEASED YET)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+* Improved logging control during builds with Maven.
+* `Column` now implements `Function` and now `by(valueDecr)` can be replaced with `by(values,decr)` and thus, projection and order are now separated.
+ * `Column` now implements `Function`. The modulator `by(valueDecr)` can be replaced by `by(values,decr)` and thus, projection and order are separated.
* Added `InputRDDFormat` which wraps an `InputRDD` to make it accessible to Hadoop and not just Spark.
* Added `AbstractSparkTest` which handles closing `SparkContext` instances between tests now that we support persisted contexts.
* Fixed a serialization bug in `GryoSerializer` that made it difficult for graph providers to yield `InputRDDs` for `SparkGraphComputer`.