Merge branch 'tp33'

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

Branch: refs/heads/tp33
Commit: a33c5ca80a12b4e29c30a2c3247fba83ae19e90f
Parents: f2f0cbd 00b5a69
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Mar 15 19:36:48 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Mar 15 19:36:48 2018 -0400

----------------------------------------------------------------------
 data/tinkerpop-sink.json                           |   4 ++--
 data/tinkerpop-sink.kryo                           | Bin 288 -> 234 bytes
 .../io/graphson/tinkerpop-sink-typed-v1d0.json     |   4 ++--
 .../io/graphson/tinkerpop-sink-typed-v2d0.json     |   4 ++--
 .../structure/io/graphson/tinkerpop-sink-v1d0.json |   4 ++--
 .../structure/io/graphson/tinkerpop-sink-v2d0.json |   4 ++--
 .../structure/io/graphson/tinkerpop-sink-v3d0.json |   4 ++--
 .../structure/io/gryo/tinkerpop-sink-v1d0.kryo     | Bin 288 -> 234 bytes
 .../structure/io/gryo/tinkerpop-sink-v3d0.kryo     | Bin 288 -> 234 bytes
 .../tinkergraph/structure/TinkerFactory.java       |  11 ++++-------
 10 files changed, 16 insertions(+), 19 deletions(-)
----------------------------------------------------------------------


Reply via email to