Merge branch 'tp32' into tp33
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/13a20e56 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/13a20e56 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/13a20e56 Branch: refs/heads/tp33 Commit: 13a20e569f85dcb3e5a8f7b32b4491b47bae25d6 Parents: ffabea8 fdac653 Author: Jorge Bay Gondra <[email protected]> Authored: Fri Mar 23 12:21:34 2018 +0100 Committer: Jorge Bay Gondra <[email protected]> Committed: Fri Mar 23 12:21:34 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/13a20e56/docs/src/dev/developer/development-environment.asciidoc ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/13a20e56/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj ----------------------------------------------------------------------
