[37/50] tinkerpop git commit: Merge branch 'tp32' into tp33

2018-09-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/b34515a9 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/b34515a9 Diff:

[37/50] tinkerpop git commit: Merge branch 'tp32' into tp33

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

[37/50] tinkerpop git commit: Merge branch 'tp32' into tp33

2018-07-31 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/ddc66941 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/ddc66941 Diff:

[37/50] tinkerpop git commit: Merge branch 'tp32' into tp33

2018-07-26 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/1bd35dcc Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/1bd35dcc Diff:

[37/50] tinkerpop git commit: Merge branch 'tp32' into tp33

2018-03-20 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/78fd0193 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/78fd0193 Diff:

[37/50] tinkerpop git commit: Merge branch 'tp32'

2018-02-27 Thread dkuppitz
Merge branch 'tp32' Conflicts: docs/src/reference/gremlin-applications.asciidoc gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/Channelizer.java gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/Settings.java

[37/50] tinkerpop git commit: Merge branch 'tp32'

2017-09-12 Thread rdale
Merge branch 'tp32' Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/8340ca7c Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/8340ca7c Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/8340ca7c

[37/50] tinkerpop git commit: Merge branch 'tp32'

2017-06-19 Thread spmallette
Merge branch 'tp32' 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

[37/50] tinkerpop git commit: Merge branch 'tp32'

2016-10-24 Thread okram
Merge branch 'tp32' Conflicts: giraph-gremlin/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