You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by ok...@apache.org on 2015/04/24 22:49:21 UTC

[4/5] incubator-tinkerpop git commit: Merge branch 'master' into p-predicate-model

Merge branch 'master' into p-predicate-model


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

Branch: refs/heads/p-predicate-model
Commit: bdd29e965b8e72e7b97cfd4f8fbb3e0cfcd77b69
Parents: eb78cfd 594dc82
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Fri Apr 24 14:38:12 2015 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Fri Apr 24 14:38:12 2015 -0600

----------------------------------------------------------------------
 data/grateful-dead-vertices.kryo                | Bin 391510 -> 335733 bytes
 data/grateful-dead-vertices.ldjson              | 422 +++++++++----------
 data/grateful-dead.kryo                         | Bin 391510 -> 332385 bytes
 data/tinkerpop-classic-vertices.kryo            | Bin 1129 -> 729 bytes
 data/tinkerpop-classic.kryo                     | Bin 1129 -> 729 bytes
 data/tinkerpop-crew-vertices.kryo               | Bin 1949 -> 1386 bytes
 data/tinkerpop-crew.kryo                        | Bin 1949 -> 1386 bytes
 data/tinkerpop-modern-vertices.kryo             | Bin 1181 -> 781 bytes
 data/tinkerpop-modern.kryo                      | Bin 1181 -> 781 bytes
 .../gremlin/structure/util/star/StarGraph.java  |   2 +-
 gremlin-server/data/sample.kryo                 | Bin 2817115 -> 2416891 bytes
 .../io/gryo/grateful-dead-vertices.kryo         | Bin 391510 -> 335733 bytes
 .../structure/io/gryo/grateful-dead.kryo        | Bin 391510 -> 332385 bytes
 .../io/gryo/tinkerpop-classic-vertices.kryo     | Bin 1129 -> 729 bytes
 .../structure/io/gryo/tinkerpop-classic.kryo    | Bin 1129 -> 729 bytes
 .../io/gryo/tinkerpop-crew-vertices.kryo        | Bin 1949 -> 1386 bytes
 .../structure/io/gryo/tinkerpop-crew.kryo       | Bin 1949 -> 1386 bytes
 .../io/gryo/tinkerpop-modern-vertices.kryo      | Bin 1181 -> 781 bytes
 .../structure/io/gryo/tinkerpop-modern.kryo     | Bin 1181 -> 781 bytes
 19 files changed, 212 insertions(+), 212 deletions(-)
----------------------------------------------------------------------