You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by dk...@apache.org on 2015/06/05 22:18:05 UTC

[12/26] incubator-tinkerpop git commit: Merge branch 'master' into preprocessor

Merge branch 'master' into preprocessor


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

Branch: refs/heads/master
Commit: 774100e2de0e6f42e197912935071ed9f2a54b62
Parents: 38a0733 4a0bf78
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Mon Jun 1 22:27:41 2015 +0200
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Mon Jun 1 22:27:41 2015 +0200

----------------------------------------------------------------------
 .../peerpressure/ClusterCountMapReduce.java     |  2 +-
 .../ClusterPopulationMapReduce.java             |  2 +-
 .../peerpressure/PeerPressureVertexProgram.java |  2 +-
 .../ranking/pagerank/PageRankMapReduce.java     |  2 +-
 .../ranking/pagerank/PageRankVertexProgram.java |  2 +-
 .../traversal/TraversalVertexProgram.java       |  4 +-
 .../dsl/graph/GraphTraversalSource.java         |  2 +-
 .../engine/ComputerTraversalEngine.java         |  2 +-
 .../engine/StandardTraversalEngine.java         |  2 +-
 .../strategy/decoration/ElementIdStrategy.java  |  2 +-
 .../strategy/decoration/EventStrategy.java      |  2 +-
 .../strategy/decoration/PartitionStrategy.java  |  2 +-
 .../strategy/decoration/SubgraphStrategy.java   |  2 +-
 .../tinkerpop/gremlin/structure/Vertex.java     | 25 ++++---
 .../gremlin/structure/io/GraphMigrator.java     |  3 +
 .../tinkerpop/gremlin/structure/io/IoCore.java  |  3 +
 .../gremlin/structure/io/graphml/GraphMLIo.java |  6 +-
 .../structure/io/graphml/GraphMLMapper.java     |  6 +-
 .../structure/io/graphml/GraphMLReader.java     |  2 +-
 .../structure/io/graphml/GraphMLTokens.java     |  4 +-
 .../structure/io/graphml/GraphMLWriter.java     |  2 +-
 .../io/graphml/GraphMLWriterHelper.java         |  7 +-
 .../structure/io/graphson/GraphSONIo.java       |  6 +-
 .../structure/io/graphson/GraphSONModule.java   |  2 +-
 .../structure/io/graphson/GraphSONReader.java   |  9 ++-
 .../io/graphson/GraphSONSerializers.java        | 14 ++--
 .../structure/io/graphson/GraphSONVersion.java  |  2 +-
 .../structure/io/graphson/GraphSONWriter.java   |  2 +-
 .../io/graphson/LegacyGraphSONReader.java       | 73 ++++++++++----------
 .../structure/io/gryo/EntrySerializer.java      |  2 +-
 .../gremlin/structure/io/gryo/GryoIo.java       |  6 +-
 .../gremlin/structure/io/gryo/GryoMapper.java   |  2 +-
 .../gremlin/structure/io/gryo/GryoPool.java     |  2 +-
 .../gremlin/structure/io/gryo/GryoReader.java   |  4 +-
 .../structure/io/gryo/GryoSerializers.java      | 12 ++--
 .../gremlin/structure/io/gryo/GryoWriter.java   |  4 +-
 .../structure/io/gryo/URISerializer.java        |  2 +-
 .../structure/io/gryo/UUIDSerializer.java       |  2 +-
 .../io/gryo/VertexByteArrayInputStream.java     |  2 +-
 .../structure/io/gryo/VertexTerminator.java     |  2 +-
 .../gremlin/structure/io/GraphMigratorTest.java | 32 +++++++++
 .../gremlin/structure/io/IoCoreTest.java        | 53 ++++++++++++++
 .../tinkerpop/gremlin/driver/Cluster.java       |  2 +-
 .../gremlin/driver/message/ResponseMessage.java |  2 +-
 .../gremlin/groovy/engine/GremlinExecutor.java  |  2 +-
 .../algorithm/generator/CommunityGenerator.java |  2 +-
 .../generator/DistributionGenerator.java        |  2 +-
 47 files changed, 216 insertions(+), 113 deletions(-)
----------------------------------------------------------------------