Merge branch 'TINKERPOP-1880' into tp32
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/fdac6531 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/fdac6531 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/fdac6531 Branch: refs/heads/TINKERPOP-1897 Commit: fdac6531f89e59306659ca850112b6a6857bd32a Parents: 8a76583 f972d11 Author: Jorge Bay Gondra <[email protected]> Authored: Fri Mar 23 12:21:00 2018 +0100 Committer: Jorge Bay Gondra <[email protected]> Committed: Fri Mar 23 12:21:00 2018 +0100 ---------------------------------------------------------------------- .travis.yml | 8 +++++--- docker/Dockerfile | 7 ++++--- docs/src/dev/developer/development-environment.asciidoc | 2 +- gremlin-dotnet/glv/Gremlin.Net.csproj.template | 1 - gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj | 1 - .../Gremlin.Net.IntegrationTest.csproj | 3 +-- .../test/Gremlin.Net.UnitTest/Gremlin.Net.UnitTest.csproj | 3 +-- 7 files changed, 12 insertions(+), 13 deletions(-) ----------------------------------------------------------------------
