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/07 19:55:10 UTC

[4/4] incubator-tinkerpop git commit: Merge remote-tracking branch 'origin/TINKERPOP3-995'

Merge remote-tracking branch 'origin/TINKERPOP3-995'

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/67684310
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/67684310
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/67684310

Branch: refs/heads/master
Commit: 6768431044e98cd9ad84dd41dc7a952e6347a593
Parents: 43b790d 6f8c580
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Dec 7 13:54:58 2015 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon Dec 7 13:54:58 2015 -0500

----------------------------------------------------------------------
 CHANGELOG.asciidoc                              |  3 ++-
 .../upgrade/release-3.1.x-incubating.asciidoc   | 14 ++++++++++
 .../server/auth/AllowAllAuthenticator.java      | 10 ++++++++
 .../gremlin/server/auth/Authenticator.java      | 27 +++++++++++++++++---
 .../server/auth/SimpleAuthenticator.java        |  9 +++++++
 .../handler/SaslAuthenticationHandler.java      | 22 +++++++++++++++-
 6 files changed, 80 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/67684310/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --cc CHANGELOG.asciidoc
index 0ebff5e,bb969c6..8eac747
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@@ -26,21 -26,10 +26,22 @@@ image::https://raw.githubusercontent.co
  TinkerPop 3.1.1 (NOT OFFICIALLY RELEASED YET)
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  
 +* 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` 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`.
 +* `SparkGraphComputer` is now tested against Gryo, GraphSON, and `InputRDD` data sources.
 +* `HadoopElementIterator` (for Hadoop-Gremlin OLTP) now works for any `InputFormat`, not just `FileInputFormats`.
 +* Added `Traverser.Admin.getTags()` which are used to mark branches in a traversal (useful in `match()` and related future steps).
 +* Fixed the `Future` model for `GiraphGraphComputer` and `SparkGraphComputer` so that class loaders are preserved.
 +* Added support for arbitrary vertex ID types in `BulkLoaderVertexProgram`.
- * Deprecate `credentialsDbLocation` from `SimpleAuthenticator` in Gremlin Server.
+ * Deprecated `credentialsDbLocation` from `SimpleAuthenticator` in Gremlin Server.
  * `TinkerGraph` has "native" serialization in GraphSON, which enables it to be a return value from Gremlin Server.
  * Improved the ability to embed Gremlin Server by providing a way to get the `ServerGremlinExecutor` and improve reusability of `AbstractEvalOpProcessor` and related classes.
+ * Added `Authenticator.newSaslNegotiator(InetAddress)` and deprecated the zero-arg version of that method.
  * `ProfileStep` is now available off of `Traversal` via `profile()`. To be consistent with `Traversal.explain()`.
  * If no comparator is provided to `order()`, `Order.incr` is assumed (previously, an exception occurred).
  * Fixed various Gremlin-Groovy tests that assumed `toString()`-able ids.