Merge branch 'tp32'
Conflicts:
gremlin-python/src/main/jython/gremlin_python/driver/driver_remote_connection.py
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/de45df4f
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/de45df4f
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/de45df4f
Branch: refs/heads/master
Commit: de45df4f34138b939d1e818d547707c40869434f
Parents: 4772d7d 545f3bf
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Feb 20 13:35:34 2018 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Feb 20 13:35:34 2018 -0500
----------------------------------------------------------------------
.../jython/gremlin_python/driver/driver_remote_connection.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
