Merge branch 'tp32' into tp33
Conflicts:
giraph-gremlin/pom.xml
gremlin-archetype/gremlin-archetype-dsl/pom.xml
gremlin-archetype/gremlin-archetype-server/pom.xml
gremlin-archetype/gremlin-archetype-tinkergraph/pom.xml
gremlin-archetype/pom.xml
gremlin-console/bin/gremlin.sh
gremlin-console/pom.xml
gremlin-core/pom.xml
gremlin-dotnet/pom.xml
gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
gremlin-dotnet/src/pom.xml
gremlin-dotnet/test/pom.xml
gremlin-driver/pom.xml
gremlin-groovy-test/pom.xml
gremlin-groovy/pom.xml
gremlin-javascript/pom.xml
gremlin-javascript/src/main/javascript/gremlin-javascript/package.json
gremlin-python/pom.xml
gremlin-server/pom.xml
gremlin-shaded/pom.xml
gremlin-test/pom.xml
gremlin-tools/gremlin-benchmark/pom.xml
hadoop-gremlin/pom.xml
neo4j-gremlin/pom.xml
pom.xml
spark-gremlin/pom.xml
tinkergraph-gremlin/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/39c3365e
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/39c3365e
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/39c3365e
Branch: refs/heads/TINKERPOP-1888
Commit: 39c3365e63a6d2fb39ea958aa89b80e77885d2cf
Parents: 76565c3 1592c4f
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Fri Apr 6 21:19:04 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Fri Apr 6 21:19:04 2018 -0400
----------------------------------------------------------------------
gremlin-dotnet/glv/Gremlin.Net.csproj.template | 4 ++--
gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj | 8 ++++----
.../src/main/javascript/gremlin-javascript/package.json | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/39c3365e/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
----------------------------------------------------------------------
diff --cc gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
index cb3587a,fc75b83..1a6bdad
--- a/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
+++ b/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
@@@ -25,9 -25,9 +25,9 @@@ limitations under the License
</PropertyGroup>
<PropertyGroup Label="Package">
- <Version>3.3.2</Version>
- <FileVersion>3.3.2.0</FileVersion>
- <Version>3.2.9-SNAPSHOT</Version>
- <FileVersion>3.2.9.0</FileVersion>
- <AssemblyVersion>3.2.0.0</AssemblyVersion>
++ <Version>3.3.3-SNAPSHOT</Version>
++ <FileVersion>3.3.3.0</FileVersion>
+ <AssemblyVersion>3.3.0.0</AssemblyVersion>
<Title>Gremlin.Net</Title>
<Authors>Apache TinkerPop</Authors>
<Description>Gremlin.Net for Apache TinkerPop⢠is a language variant
and driver for .NET.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/39c3365e/gremlin-javascript/src/main/javascript/gremlin-javascript/package.json
----------------------------------------------------------------------
diff --cc gremlin-javascript/src/main/javascript/gremlin-javascript/package.json
index ced9f58,d20be6a..004f307
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/package.json
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/package.json
@@@ -1,6 -1,6 +1,6 @@@
{
"name": "gremlin-javascript",
- "version": "3.3.2",
- "version": "3.2.9-alpha1",
++ "version": "3.3.3-alpha1",
"description": "JavaScript Gremlin Language Variant",
"author": "Apache TinkerPop team",
"keywords": [
