Merge branch 'TINKERPOP-1317'
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/a6c19f06 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/a6c19f06 Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/a6c19f06 Branch: refs/heads/TINKERPOP-1331 Commit: a6c19f069e9dc4c2ac0f42053cb7779fb759979a Parents: 7386035 e7b7d14 Author: Jason Plurad <plur...@us.ibm.com> Authored: Wed Jun 8 01:16:03 2016 -0400 Committer: Jason Plurad <plur...@us.ibm.com> Committed: Wed Jun 8 01:16:03 2016 -0400 ---------------------------------------------------------------------- docs/src/dev/provider/index.asciidoc | 5 +++++ .../org/apache/tinkerpop/gremlin/structure/io/IoGraphTest.java | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/a6c19f06/docs/src/dev/provider/index.asciidoc ----------------------------------------------------------------------