[5/5] tinkerpop git commit: Merge branch 'tp33'

Merge branch 'tp33' Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/2d69efd5 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/2d69efd5 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/2d69efd5

[5/5] tinkerpop git commit: Merge branch 'tp33'

Merge branch 'tp33' Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/7ac00a13 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/7ac00a13 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/7ac00a13

[5/5] tinkerpop git commit: Merge branch 'tp33'

Merge branch 'tp33' Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/8b5a437a Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/8b5a437a Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/8b5a437a

[5/5] tinkerpop git commit: Merge branch 'tp33'

Merge branch 'tp33' Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/de29c768 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/de29c768 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/de29c768

[5/5] tinkerpop git commit: Merge branch 'tp33'

Merge branch 'tp33' Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/3cd352ee Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/3cd352ee Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/3cd352ee

[5/5] tinkerpop git commit: Merge branch 'tp33'

Merge branch 'tp33' Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/d3b6a340 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/d3b6a340 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/d3b6a340

[5/5] tinkerpop git commit: Merge branch 'tp33'

Merge branch 'tp33' Conflicts: gremlin-test/features/map/Order.feature gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderTest.java Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit:

[5/5] tinkerpop git commit: Merge branch 'tp33'

Merge branch 'tp33' 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

[5/5] tinkerpop git commit: Merge branch 'tp33'

Merge branch 'tp33' Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/a0984378 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/a0984378 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/a0984378

[5/5] tinkerpop git commit: Merge branch 'tp33'

Merge branch 'tp33' Conflicts: gremlin-javascript/src/main/javascript/gremlin-javascript/package.json Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/46b743d4 Tree:

[5/5] tinkerpop git commit: Merge branch 'tp33'

Merge branch 'tp33' Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/ead0edaf Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/ead0edaf Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/ead0edaf

[5/5] tinkerpop git commit: Merge branch 'tp33'

Merge branch 'tp33' Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/f532f9ed Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/f532f9ed Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/f532f9ed