Merge remote-tracking branch 'lewismc/TINKERPOP-1301tp31' into tp31
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/0445e6d5 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/0445e6d5 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/0445e6d5 Branch: refs/heads/TINKERPOP-1063 Commit: 0445e6d59940e71a5ddab78181410e124dcfca7a Parents: 029f56b d5d2c48 Author: Daniel Kuppitz <daniel_kupp...@hotmail.com> Authored: Sat Jun 4 01:06:43 2016 +0200 Committer: Daniel Kuppitz <daniel_kupp...@hotmail.com> Committed: Sat Jun 4 01:06:43 2016 +0200 ---------------------------------------------------------------------- .../gremlin/hadoop/structure/io/script/ScriptInputFormat.java | 5 +++++ .../gremlin/hadoop/structure/io/script/ScriptOutputFormat.java | 6 ++++++ 2 files changed, 11 insertions(+) ----------------------------------------------------------------------
