Merge branch 'tp32' into tp33
Conflicts:
gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessor.java
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/fa7a7f61
Tree: http://
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/a708cc3b
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/a708cc3b
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/a7
Merge branch 'tp32' into tp33
Conflicts:
gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/247e008c
Tree: http://git-wip-us.apache.or
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
gremlin-server/src/mai
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/c7afb388
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/c7afb388
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/c7afb388
Br
Merge branch 'tp32'
Conflicts:
docs/src/reference/gremlin-applications.asciidoc
gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/Settings.java
gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/channel/HttpChannelizer.java
gremlin-se
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/5c107171
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/5c107171
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/5c107171
Br
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/e4d0331d
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/e4d0331d
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/e4d0331d
Br
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