fixed a bug in the CHANGELOG and added a few more things.

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

Branch: refs/heads/master
Commit: b8a2452deb7f6a23fae29684c1ead2ed35d7cb69
Parents: 4189207
Author: Marko A. Rodriguez <[email protected]>
Authored: Tue Nov 29 06:00:19 2016 -0700
Committer: Marko A. Rodriguez <[email protected]>
Committed: Tue Nov 29 06:00:19 2016 -0700

----------------------------------------------------------------------
 CHANGELOG.asciidoc | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b8a2452d/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index f09c0dc..c08fecd 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -48,6 +48,8 @@ TinkerPop 3.3.0 (Release Date: NOT OFFICIALLY RELEASED YET)
 * Moved the source for the "home page" into the repository under `/site` so 
that it easier to accept contributions.
 * Bumped to support Spark 2.0.0.
 * Added `UnshadedKryoShimService` as the new default serializer model for 
`SparkGraphComputer`.
+* `GryoRegistrator` is more efficient than the previous `GryoSerializer` model 
in `SparkGraphComputer`.
+* Added support for `IoRegistry` custom serialization in Spark/Giraph and 
provided a general `hadoop-gremlin` test suite.
 * Replaced term `REST` with `HTTP` to remove any confusion as to the design of 
the API.
 * Moved `gremlin-benchmark` under `gremlin-tools` module.
 * Added `gremlin-tools` and its submodule `gremlin-coverage`.
@@ -169,9 +171,6 @@ This release also includes changes from <<release-3-1-5, 
3.1.5>>.
 * Produced better errors in `readGraph` of `GryoReader` and `GraphSONReader` 
if a `Vertex` cannot be found in the cache on edge loading.
 * VertexPrograms can now declare traverser requirements, e.g. to have access 
to the path when used with `.program()`.
 * New build options for `gremlin-python` where `-DglvPython` is no longer 
required.
-=======
-* Bumped to support Spark 2.0.0.
->>>>>>> had to go back down to Hadoop 2.7.2 because Hadoop 2.7.3 changed a 
method signature that GiraphJob calls and thus, Giraph fails. Dar. Cleaned up 
pom.xmls a bit and updated CHANGELOG. This branch is ready to be tested on the 
Blade cluster against the Friendster dataset.
 * Added missing `InetAddress` to GraphSON extension module.
 * Added new recipe for "Pagination".
 * Added new recipe for "Recommendation".

Reply via email to