Merge branch 'tp32' into tp33
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/5d71dc1c Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/5d71dc1c Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/5d71dc1c Branch: refs/heads/tp33 Commit: 5d71dc1c50d7ba2404a058f5be56fb1da8108583 Parents: ba82a5c a4e087d Author: Stephen Mallette <sp...@genoprime.com> Authored: Mon Jun 18 16:06:26 2018 -0400 Committer: Stephen Mallette <sp...@genoprime.com> Committed: Mon Jun 18 16:06:26 2018 -0400 ---------------------------------------------------------------------- gremlin-python/src/main/jython/tests/conftest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5d71dc1c/gremlin-python/src/main/jython/tests/conftest.py ----------------------------------------------------------------------
