Merge branch 'tp32' into tp33
Conflicts:
gremlin-server/src/main/bin/gremlin-server.bat
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/a050b6ed
Tree:
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/59fc032f
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/59fc032f
Diff:
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/1ca5ef3d
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/1ca5ef3d
Diff:
Merge branch 'tp32' into tp33
Conflicts:
gremlin-core/src/test/resources/log4j-silent.properties
gremlin-core/src/test/resources/log4j-test.properties
tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/TinkerGraphComputerProvider.java
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/e1ef8b62
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/e1ef8b62
Diff:
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/13a20e56
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/13a20e56
Diff:
Merge branch 'tp32' into tp33
Conflicts:
gremlin-python/src/main/java/org/apache/tinkerpop/gremlin/python/jsr223/PythonTranslator.java
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/0c6459d9
Tree:
