added link: to release notes and fixed conflicts in CHANGELOG.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/4203bd86 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/4203bd86 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/4203bd86 Branch: refs/heads/master Commit: 4203bd867718913d4c0d823fd11de5d4a106d345 Parents: 144441a 8cf3173 Author: Marko A. Rodriguez <okramma...@gmail.com> Authored: Wed Jul 12 07:56:27 2017 -0600 Committer: Marko A. Rodriguez <okramma...@gmail.com> Committed: Wed Jul 12 07:56:27 2017 -0600 ---------------------------------------------------------------------- CHANGELOG.asciidoc | 1 + docs/src/upgrade/release-3.3.x.asciidoc | 7 ++- .../gremlin/process/traversal/Order.java | 61 -------------------- .../jython/gremlin_python/process/traversal.py | 6 +- 4 files changed, 8 insertions(+), 67 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4203bd86/CHANGELOG.asciidoc ---------------------------------------------------------------------- diff --cc CHANGELOG.asciidoc index 8c08d5d,2486b94..7fe3636 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@@ -26,9 -26,7 +26,10 @@@ image::https://raw.githubusercontent.co TinkerPop 3.3.0 (Release Date: NOT OFFICIALLY RELEASED YET) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +* Established the Gryo 3.0 format. +* `GryoVersion` now includes a default `ClassResolver` to supply to the `GryoMapper`. +* `GryoClassResolver` renamed to `GryoClassResolverV1d0` which has an abstract class that for providers to extend in `AbstractGryoClassResolver`. + * Removed previously deprecatd `Order` enums of `keyIncr`, `keyDecr`, `valueIncr`, and `valueDecr.` * Removed previously deprecated `TraversalSource.Builder` class. * Removed previously deprecated `ConnectiveP`, `AndP`, `OrP` constructors. * Removed previously deprecated `TraversalScriptFunction` class. http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4203bd86/docs/src/upgrade/release-3.3.x.asciidoc ---------------------------------------------------------------------- diff --cc docs/src/upgrade/release-3.3.x.asciidoc index e02bc6e,3f12891..3b73242 --- a/docs/src/upgrade/release-3.3.x.asciidoc +++ b/docs/src/upgrade/release-3.3.x.asciidoc @@@ -309,7 -308,7 +313,8 @@@ link:https://issues.apache.org/jira/bro link:https://issues.apache.org/jira/browse/TINKERPOP-1622[TINKERPOP-1622], link:https://issues.apache.org/jira/browse/TINKERPOP-1651[TINKERPOP-1651], link:https://issues.apache.org/jira/browse/TINKERPOP-1694[TINKERPOP-1694], --link:https://issues.apache.org/jira/browse/TINKERPOP-1700[TINKERPOP-1700] ++link:https://issues.apache.org/jira/browse/TINKERPOP-1700[TINKERPOP-1700], ++link:https://issues.apache.org/jira/browse/TINKERPOP-1142[TINKERPOP-1142] Gremlin-server.sh and Init Scripts ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^