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 2016/10/12 14:46:28 UTC
[5/5] tinkerpop git commit: Merge branch 'TINKERPOP-1487'
Merge branch 'TINKERPOP-1487'
Conflicts:
CHANGELOG.asciidoc
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/72ed7951
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/72ed7951
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/72ed7951
Branch: refs/heads/master
Commit: 72ed7951f72aebbb40c04f34096e77449081c9bd
Parents: 13a73f7 ec6acef
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Oct 12 10:46:13 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Oct 12 10:46:13 2016 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 3 +
docs/src/dev/io/graphml.asciidoc | 119 +
docs/src/dev/io/graphson.asciidoc | 4651 ++++++++++++++++++
docs/src/dev/io/gryo.asciidoc | 63 +
docs/src/dev/io/index.asciidoc | 37 +
docs/src/dev/provider/index.asciidoc | 4 +
docs/src/index.asciidoc | 2 +
.../upgrade/release-3.2.x-incubating.asciidoc | 9 +
docs/static/images/gremlin-io2.png | Bin 0 -> 185756 bytes
.../structure/io/graphson/GraphSONModule.java | 2 +-
pom.xml | 25 +
.../structure/TinkerIoRegistryV2d0.java | 2 +-
12 files changed, 4915 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/72ed7951/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --cc CHANGELOG.asciidoc
index a97a32c,f24f8d1..ca52015
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@@ -48,7 -42,8 +48,9 @@@ TinkerPop 3.2.3 (Release Date: NOT OFFI
* Fixed a end-step label bug in `MatchPredicateStrategy`.
* Fixed a bug in `MatchPredicateStrategy` where inlined traversals did not have strategies applied to it.
* Fixed a bug in `RepeatUnrollStrategy` where inlined traversal did not have strategies applied to it.
+* Fixed padding of prompt in Gremlin Console when the number of lines went beyond a single digit.
+ * Fixed GraphSON 2.0 namespace for `TinkerGraph` to be "tinker" instead of "gremlin".
+ * Dropped serialization support in GraphSON 2.0 for `Calendar`, `TimeZone`, and `Timestamp`.
* Added `TraversalHelper.copyLabels()` for copying (or moving) labels form one step to another.
* Added `TraversalHelper.applySingleLevelStrategies()` which will apply a subset of strategies but not walk the child tree.
* Added the concept that hidden labels using during traversal compilation are removed at the end during `StandardVerificationStrategy`. (*breaking*)
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/72ed7951/docs/src/dev/provider/index.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/72ed7951/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONModule.java
----------------------------------------------------------------------