Merge branch 'tp32'
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/e11d6764 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/e11d6764 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/e11d6764 Branch: refs/heads/TINKERPOP-1564 Commit: e11d6764c4030fa2d8934214c0e908893c5a1060 Parents: 3fc700f 061a2d4 Author: Stephen Mallette <[email protected]> Authored: Tue Jan 3 13:50:26 2017 -0500 Committer: Stephen Mallette <[email protected]> Committed: Tue Jan 3 13:50:26 2017 -0500 ---------------------------------------------------------------------- .../gremlin/server/GremlinServerIntegrateTest.java | 4 ++-- .../org/apache/tinkerpop/gremlin/TestHelper.java | 16 ++++++++++++++++ .../traversal/step/map/PeerPressureTest.java | 2 ++ 3 files changed, 20 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
