Merge branch 'tp32'
Conflicts:
gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/b21c9cd3
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/b21c9cd3
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/b21c9cd3
Branch: refs/heads/master
Commit: b21c9cd3308c9327dc103b625d25422d5aa54efc
Parents: b8d1c04 132011f
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Sep 20 12:29:47 2017 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Sep 20 12:29:47 2017 -0400
----------------------------------------------------------------------
gremlin-dotnet/build/tinkerpop.snk | Bin 0 -> 596 bytes
gremlin-dotnet/glv/Gremlin.Net.csproj.template | 7 ++++++-
gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj | 7 ++++++-
.../Gremlin.Net.IntegrationTest.csproj | 3 +++
.../Gremlin.Net.UnitTest/Gremlin.Net.UnitTest.csproj | 3 +++
5 files changed, 18 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b21c9cd3/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
----------------------------------------------------------------------
diff --cc gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
index ef6bdc6,0dff700..e3035e3
--- a/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
+++ b/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
@@@ -1,4 -1,4 +1,4 @@@
--<!--
++<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
@@@ -25,7 -25,9 +25,9 @@@ limitations under the License
</PropertyGroup>
<PropertyGroup Label="Package">
- <Version>3.2.7-SNAPSHOT</Version>
- <FileVersion>3.2.7.0</FileVersion>
- <AssemblyVersion>3.2.0.0</AssemblyVersion>
+ <Version>3.3.1-SNAPSHOT</Version>
++ <FileVersion>3.3.1.0</FileVersion>
++ <AssemblyVersion>3.3.0.0</AssemblyVersion>
<Title>Gremlin.Net</Title>
<Authors>Apache TinkerPop</Authors>
<Description>
