Merge branch 'tp33'
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/32a0372f Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/32a0372f Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/32a0372f Branch: refs/heads/tp33 Commit: 32a0372f7e5012df6f2ae0b2359e1dbdbc2da379 Parents: 0996419 13a20e5 Author: Jorge Bay Gondra <jorgebaygon...@gmail.com> Authored: Fri Mar 23 12:21:49 2018 +0100 Committer: Jorge Bay Gondra <jorgebaygon...@gmail.com> Committed: Fri Mar 23 12:21:49 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(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/32a0372f/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj ----------------------------------------------------------------------