[28/31] tinkerpop git commit: Merge branch 'tp32' into tp33

2018-06-04 Thread spmallette
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/055f1d5e
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/055f1d5e
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/055f1d5e

Branch: refs/heads/TINKERPOP-1975
Commit: 055f1d5ee33c6f0f49267ef48365eff9f0d0bafa
Parents: ee65d5f aac534e
Author: Florian Hockmann 
Authored: Mon Jun 4 20:41:28 2018 +0200
Committer: Florian Hockmann 
Committed: Mon Jun 4 20:41:28 2018 +0200

--
 gremlin-console/pom.xml |  4 ++--
 gremlin-server/pom.xml  |  4 ++--
 pom.xml | 16 
 3 files changed, 20 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/055f1d5e/gremlin-console/pom.xml
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/055f1d5e/gremlin-server/pom.xml
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/055f1d5e/pom.xml
--



[28/31] tinkerpop git commit: Merge branch 'tp32' into tp33

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

Branch: refs/heads/TRAVIS-TEST
Commit: f9f3d4fc8a65ddbd73dea51cc692d841e2766852
Parents: 510231a f02f94f
Author: Stephen Mallette 
Authored: Tue Mar 13 08:40:46 2018 -0400
Committer: Stephen Mallette 
Committed: Tue Mar 13 08:40:46 2018 -0400

--
 .../apache/tinkerpop/gremlin/jsr223/JavaTranslator.java   | 10 +++---
 1 file changed, 3 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f9f3d4fc/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/JavaTranslator.java
--