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 2018/09/12 16:37:02 UTC

[6/7] tinkerpop git commit: Merge branch 'tp33'

Merge branch 'tp33'

Conflicts:
	gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoVersion.java


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

Branch: refs/heads/TINKERPOP-2033
Commit: e914a670f0f169d0abff50363d510384ca57badf
Parents: 9143ffd 0eeeb0d
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Sep 12 11:58:00 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Sep 12 11:58:00 2018 -0400

----------------------------------------------------------------------
 CHANGELOG.asciidoc                                |  2 ++
 .../gremlin/structure/io/gryo/GryoVersion.java    | 12 +++++++++++-
 .../structure/io/gryo/UtilSerializers.java        | 18 ++++++++++++++++++
 3 files changed, 31 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e914a670/CHANGELOG.asciidoc
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e914a670/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoVersion.java
----------------------------------------------------------------------