[6/6] tinkerpop git commit: Merge branch 'tp33'

2018-08-16 Thread spmallette 
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/c0ab050c
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/c0ab050c
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/c0ab050c

Branch: refs/heads/master
Commit: c0ab050c24d6293000a794566c49d343046bdeb9
Parents: ee270e9 31f509d
Author: Stephen Mallette 
Authored: Thu Aug 16 15:14:54 2018 -0400
Committer: Stephen Mallette 
Committed: Thu Aug 16 15:14:54 2018 -0400

--
 CHANGELOG.asciidoc  |  1 +
 .../archetype-resources/README.asciidoc |  6 ++--
 .../archetype-resources/src/main/java/App.java  |  1 +
 .../src/main/java/Service.java  | 34 +---
 .../src/test/java/ServiceTest.java  |  2 +-
 5 files changed, 21 insertions(+), 23 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c0ab050c/CHANGELOG.asciidoc
--

[6/6] tinkerpop git commit: Merge branch 'tp33'

2018-07-22 Thread florianhockmann 
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/2596bcf0
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/2596bcf0
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/2596bcf0

Branch: refs/heads/master
Commit: 2596bcf02680b201ddf1c71b6f74ec2783435331
Parents: c21aa28 b757173
Author: Florian Hockmann 
Authored: Sun Jul 22 15:56:33 2018 +0200
Committer: Florian Hockmann 
Committed: Sun Jul 22 15:56:33 2018 +0200

--
 gremlin-dotnet/glv/Gremlin.Net.csproj.template| 4 +---
 gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2596bcf0/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
--

[6/6] tinkerpop git commit: Merge branch 'tp33'

2018-05-27 Thread florianhockmann 
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/c22182b8
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/c22182b8
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/c22182b8

Branch: refs/heads/master
Commit: c22182b8ca38c0c88f8ed1d6577b07cccdc429e1
Parents: f393633 ae9d7f6
Author: Florian Hockmann 
Authored: Sun May 27 19:50:52 2018 +0200
Committer: Florian Hockmann 
Committed: Sun May 27 19:50:52 2018 +0200

--
 .../src/Gremlin.Net/Structure/IO/GraphSON/GraphSONWriter.cs   | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)
--

[6/6] tinkerpop git commit: Merge branch 'tp33'

2018-04-27 Thread florianhockmann 
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/08d98ad8
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/08d98ad8
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/08d98ad8

Branch: refs/heads/master
Commit: 08d98ad82c70ab1b17800cb659c0e422e495be3f
Parents: 2c37306 a38d68f
Author: Florian Hockmann 
Authored: Fri Apr 27 09:24:02 2018 +0200
Committer: Florian Hockmann 
Committed: Fri Apr 27 09:24:02 2018 +0200

--
 gremlin-dotnet/glv/NamingConversions.template | 50 --
 1 file changed, 50 deletions(-)
--

[6/6] tinkerpop git commit: Merge branch 'tp33'

2018-04-19 Thread florianhockmann 
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/937915e3
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/937915e3
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/937915e3

Branch: refs/heads/master
Commit: 937915e30893d3ae09e46c9e0b9b289c4cd65b90
Parents: a3046b4 6aa5f2e
Author: Florian Hockmann 
Authored: Thu Apr 19 16:11:55 2018 +0200
Committer: Florian Hockmann 
Committed: Thu Apr 19 16:11:55 2018 +0200

--
 .../src/Gremlin.Net/Driver/Exceptions/ResponseException.cs | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)
--

[6/6] tinkerpop git commit: Merge branch 'tp33'

2018-04-06 Thread spmallette 
Merge branch '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/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
gremlin-tools/gremlin-coverage/pom.xml
gremlin-tools/gremlin-io-test/pom.xml
gremlin-tools/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/f83350a4
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/f83350a4
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/f83350a4

Branch: refs/heads/master
Commit: f83350a47d7b70e76b89a9062c95d07b30dd5956
Parents: c14aa30 2656b64
Author: Stephen Mallette 
Authored: Fri Apr 6 20:44:26 2018 -0400
Committer: Stephen Mallette 
Committed: Fri Apr 6 20:44:26 2018 -0400

--
 gremlin-dotnet/glv/Gremlin.Net.csproj.template| 4 ++--
 gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f83350a4/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
--

[6/6] tinkerpop git commit: Merge branch 'tp33'

2018-03-23 Thread jorgebg 
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/master
Commit: 32a0372f7e5012df6f2ae0b2359e1dbdbc2da379
Parents: 0996419 13a20e5
Author: Jorge Bay Gondra 
Authored: Fri Mar 23 12:21:49 2018 +0100
Committer: Jorge Bay Gondra 
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
--

[6/6] tinkerpop git commit: Merge branch 'tp33'

2018-03-12 Thread florianhockmann 
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/116d743f
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/116d743f
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/116d743f

Branch: refs/heads/master
Commit: 116d743f209292f675d8ded4907b39c629df1e03
Parents: bf58b63 510231a
Author: Florian Hockmann 
Authored: Mon Mar 12 20:09:10 2018 +0100
Committer: Florian Hockmann 
Committed: Mon Mar 12 20:09:10 2018 +0100

--
 .../Gherkin/GherkinTestRunner.cs  |  6 +-
 .../Gherkin/IgnoreException.cs| 10 +-
 2 files changed, 10 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/116d743f/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
--

[6/6] tinkerpop git commit: Merge branch 'tp33'

2018-03-11 Thread florianhockmann 
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/22000e44
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/22000e44
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/22000e44

Branch: refs/heads/master
Commit: 22000e449fb29abb7ffddad6f65b35a8accffd35
Parents: da63965 53c84bd
Author: Florian Hockmann 
Authored: Sun Mar 11 16:16:35 2018 +0100
Committer: Florian Hockmann 
Committed: Sun Mar 11 16:16:35 2018 +0100

--
 .../Gherkin/GherkinTestRunner.cs| 37 +++-
 .../Gherkin/IgnoreException.cs  | 20 +++
 2 files changed, 42 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/22000e44/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
--

[6/6] tinkerpop git commit: Merge branch 'tp33'

2018-03-10 Thread florianhockmann 
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/da63965f
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/da63965f
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/da63965f

Branch: refs/heads/master
Commit: da63965ff7098c844595518db6f25485f74d4c18
Parents: b4013a2 99b6da2
Author: Florian Hockmann 
Authored: Sat Mar 10 16:30:38 2018 +0100
Committer: Florian Hockmann 
Committed: Sat Mar 10 16:30:38 2018 +0100

--
 .../src/Gremlin.Net/Structure/IO/GraphSON/NumberConverter.cs  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--

[6/6] tinkerpop git commit: Merge branch 'tp33'

2018-03-06 Thread florianhockmann 
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/137f1e59
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/137f1e59
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/137f1e59

Branch: refs/heads/master
Commit: 137f1e59313a03d7977862016d2f500630d6588a
Parents: 5914aa1 98ad2fd
Author: Florian Hockmann 
Authored: Tue Mar 6 20:59:23 2018 +0100
Committer: Florian Hockmann 
Committed: Tue Mar 6 20:59:23 2018 +0100

--
 docs/src/reference/gremlin-variants.asciidoc|   2 +-
 docs/static/images/gremlin-dotnet-logo.png  | Bin 0 -> 40779 bytes
 .../images/gremlin-dotnet-logo_256x256.png  | Bin 0 -> 24406 bytes
 gremlin-dotnet/README.md|  40 +++
 gremlin-dotnet/glv/Gremlin.Net.csproj.template  |  13 ++
 .../src/Gremlin.Net/Gremlin.Net.csproj  |  13 ++
 6 files changed, 49 insertions(+), 19 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/137f1e59/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
--