You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by dk...@apache.org on 2016/01/13 00:40:25 UTC

[4/4] incubator-tinkerpop git commit: Merge branch 'TINKERPOP-938'

Merge branch 'TINKERPOP-938'

Resolved Conflicts:
	CHANGELOG.asciidoc
	docs/src/dev/developer/contributing.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/96f34b12
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/96f34b12
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/96f34b12

Branch: refs/heads/master
Commit: 96f34b12a90dc8952affa0f20ddfda5befdfadc2
Parents: 44ba975 f83a594
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Wed Jan 13 00:39:45 2016 +0100
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Wed Jan 13 00:39:45 2016 +0100

----------------------------------------------------------------------
 CHANGELOG.asciidoc                           |  1 +
 bin/process-docs.sh                          | 26 ++++++++++++++++++++++-
 docs/src/dev/developer/contributing.asciidoc |  9 +++++---
 3 files changed, 32 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/96f34b12/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --cc CHANGELOG.asciidoc
index 8be3fe4,a2d9676..1049c97
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@@ -26,16 -26,7 +26,17 @@@ image::https://raw.githubusercontent.co
  TinkerPop 3.1.1 (NOT OFFICIALLY RELEASED YET)
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  
 +* The Spark persistence `StorageLevel` can now be set for both job graphs and `PersistedOutputRDD` data.
 +* Added to the list of "invalid binding keys" allowed by Gremlin Server to cover the private fields of `T` which get exposed in the `ScriptEngine` on static imports.
 +* Fixed a bug around duration calculations of `cap()`-step during profiling.
 +* It is possible to completely avoid using HDFS with Spark if `PersistedInputRDD` and `PersistedOutpuRDD` are leveraged.
 +* `InputRDD` and `OutputRDD` can now process both graphs and memory (i.e. sideEffects).
 +* Removed Groovy specific meta-programming overloads for handling Hadoop `FileSystem` (instead, its all accessible via `FileSystemStorage`).
 +* Added `FileSystemStorage` and `SparkContextStorage` which both implement the new `Storage` API.
 +* Added `Storage` to the gremlin-core io-package which providers can implement to allow conventional access to data sources (e.g. `ls()`, `rm()`, `cp()`, etc.).
 +* Bumped to Spark 1.5.2.
 +* Bumped to Groovy 2.4.5.
+ * Added `--noClean` option in `bin/process-docs.sh` to prevent the script from cleaning Grapes and HDFS.
  * Execute the `LifeCycle.beforeEval()` in the same thread that `eval()` is executed in for `GremlinExecutor`.
  * Improved error handling of Gremlin Console initialization scripts to better separate errors in initialization script I/O versus execution of the script itself.
  * Fixed a bug in `Graph.OptOut` when trying to opt-out of certain test cases with the `method` property set to "*".

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/96f34b12/docs/src/dev/developer/contributing.asciidoc
----------------------------------------------------------------------