[3/3] tinkerpop git commit: Merge remote-tracking branch 'origin/tp31'

Merge remote-tracking branch 'origin/tp31' Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/d80d69cb Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/d80d69cb Diff:

[3/3] tinkerpop git commit: Merge remote-tracking branch 'origin/tp31'

Merge remote-tracking branch 'origin/tp31' Conflicts: gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/GremlinProcessRunner.java Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/f8092a1a Tree:

[3/3] tinkerpop git commit: Merge remote-tracking branch 'origin/tp31'

Merge remote-tracking branch 'origin/tp31' 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/pom.xml

[3/3] tinkerpop git commit: Merge remote-tracking branch 'origin/tp31'

Merge remote-tracking branch 'origin/tp31' Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/455aaf37 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/455aaf37 Diff:

[3/3] tinkerpop git commit: Merge remote-tracking branch 'origin/tp31'

Merge remote-tracking branch 'origin/tp31' Conflicts: gremlin-server/src/assembly/distribution.xml Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/d2fc54f9 Tree:

[3/3] tinkerpop git commit: Merge remote-tracking branch 'origin/tp31'

Merge remote-tracking branch 'origin/tp31' Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/f11f6cc9 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/f11f6cc9 Diff:

[3/3] tinkerpop git commit: Merge remote-tracking branch 'origin/tp31'

Merge remote-tracking branch 'origin/tp31' Conflicts: docs/src/dev/developer/development-environment.asciidoc Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/19d2eee1 Tree:

[3/3] tinkerpop git commit: Merge remote-tracking branch 'origin/tp31'

Merge remote-tracking branch 'origin/tp31' Conflicts: gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PropertiesTest.java Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: