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/08/27 00:54:22 UTC
[07/50] [abbrv] tinkerpop git commit: Merge branch 'TINKERPOP-1278'
of https://git-wip-us.apache.org/repos/asf/tinkerpop into TINKERPOP-1278
Merge branch 'TINKERPOP-1278' of https://git-wip-us.apache.org/repos/asf/tinkerpop into TINKERPOP-1278
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/72a5ae0c
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/72a5ae0c
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/72a5ae0c
Branch: refs/heads/master
Commit: 72a5ae0c43f49562624b6154c9dfdd1e4ff400f1
Parents: fbbcd46 531dcb5
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Wed Aug 24 14:42:47 2016 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Wed Aug 24 14:42:47 2016 -0600
----------------------------------------------------------------------
data/grateful-dead-v2d0-typed.json | 1616 +++++++++---------
data/tinkerpop-classic-v2d0-typed.json | 12 +-
data/tinkerpop-crew-v2d0-typed.json | 12 +-
data/tinkerpop-modern-v2d0-typed.json | 12 +-
.../structure/io/graphson/GraphSONMapper.java | 2 +-
.../structure/io/graphson/GraphSONModule.java | 68 +-
.../structure/io/graphson/GraphSONTokens.java | 2 +-
...aphSONMapperV2d0PartialEmbeddedTypeTest.java | 14 +-
.../gremlin_python/structure/io/graphson.py | 38 +-
.../io/graphson/grateful-dead-v2d0-typed.json | 1616 +++++++++---------
.../graphson/tinkerpop-classic-v2d0-typed.json | 12 +-
.../io/graphson/tinkerpop-crew-v2d0-typed.json | 12 +-
.../graphson/tinkerpop-modern-v2d0-typed.json | 12 +-
13 files changed, 1714 insertions(+), 1714 deletions(-)
----------------------------------------------------------------------