Merge branch 'tp31'
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/f24e3585 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/f24e3585 Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/f24e3585 Branch: refs/heads/TINKERPOP-1278 Commit: f24e35851e6b5122b32650d559b295086a5cf399 Parents: cb4fae1 0445e6d Author: Daniel Kuppitz <daniel_kupp...@hotmail.com> Authored: Sat Jun 4 01:07:27 2016 +0200 Committer: Daniel Kuppitz <daniel_kupp...@hotmail.com> Committed: Sat Jun 4 01:07:27 2016 +0200 ---------------------------------------------------------------------- .../gremlin/hadoop/structure/io/script/ScriptInputFormat.java | 5 +++++ .../gremlin/hadoop/structure/io/script/ScriptOutputFormat.java | 6 ++++++ 2 files changed, 11 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/f24e3585/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/script/ScriptInputFormat.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/f24e3585/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/script/ScriptOutputFormat.java ----------------------------------------------------------------------
