Merge branch 'tp32', fixed conflicts in gremlin-python/src/main/jython/tests/structure/io/test_graphson.py
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/18bd16e9 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/18bd16e9 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/18bd16e9 Branch: refs/heads/master Commit: 18bd16e98ffc36a7ce9b629a9835efb02d88db4f Parents: accc058 2436a69 Author: davebshow <davebs...@gmail.com> Authored: Mon Apr 10 16:42:34 2017 -0400 Committer: davebshow <davebs...@gmail.com> Committed: Mon Apr 10 16:42:34 2017 -0400 ---------------------------------------------------------------------- gremlin-console/src/test/python/tests/test_console.py | 8 ++------ .../src/main/jython/tests/process/test_strategies.py | 8 +------- .../src/main/jython/tests/process/test_traversal.py | 9 +-------- .../src/main/jython/tests/structure/io/test_graphson.py | 11 +++-------- .../src/main/jython/tests/structure/test_graph.py | 9 +-------- gremlin-python/src/main/jython/tests/test_statics.py | 9 +-------- 6 files changed, 9 insertions(+), 45 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/18bd16e9/gremlin-python/src/main/jython/tests/structure/io/test_graphson.py ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/18bd16e9/gremlin-python/src/main/jython/tests/structure/test_graph.py ----------------------------------------------------------------------
