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/06/12 22:30:19 UTC

[7/8] incubator-tinkerpop git commit: Merge branch 'master' into xmatch

Merge branch 'master' into xmatch


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

Branch: refs/heads/xmatch-lost
Commit: a4f5267670a8a675b33f824311e0d77afa416f80
Parents: e0444ed be988ce
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Fri Jun 12 14:22:55 2015 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Fri Jun 12 14:22:55 2015 -0600

----------------------------------------------------------------------
 CHANGELOG.asciidoc                              |    2 +
 .../tinkerpop/gremlin/server/GremlinServer.java |    8 +-
 .../traversal/step/sideEffect/ProfileTest.java  |   10 +-
 .../tinkerpop/gremlin/structure/GraphTest.java  |    3 +-
 .../structure/StructureStandardSuite.java       |   10 +
 .../tinkerpop/gremlin/structure/VertexTest.java |    3 +-
 .../gremlin/structure/io/IoCustomTest.java      |  143 ++
 .../gremlin/structure/io/IoEdgeTest.java        |  149 ++
 .../gremlin/structure/io/IoGraphTest.java       |  226 ++
 .../gremlin/structure/io/IoPropertyTest.java    |  150 ++
 .../tinkerpop/gremlin/structure/io/IoTest.java  | 2048 ++----------------
 .../gremlin/structure/io/IoVertexTest.java      |  485 +++++
 .../gremlin/structure/io/util/CustomId.java     |   92 +
 .../tinkergraph/TinkerGraphProvider.java        |   30 +-
 14 files changed, 1487 insertions(+), 1872 deletions(-)
----------------------------------------------------------------------