[2/4] tinkerpop git commit: Merge branch 'tp32' into tp33

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/49c19f1b Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/49c19f1b Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/49

[2/4] tinkerpop git commit: Merge branch 'tp32' into tp33

Merge branch 'tp32' into 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 greml

[2/4] tinkerpop git commit: Merge branch 'tp32' into tp33

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/aa40dfa6 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/aa40dfa6 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/aa

[2/4] tinkerpop git commit: Merge branch 'tp32' into tp33

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/9a75f921 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/9a75f921 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/9a

[2/4] tinkerpop git commit: Merge branch 'tp32' into tp33

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

[2/4] tinkerpop git commit: Merge branch 'tp32' into tp33

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/9bd4fd4c Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/9bd4fd4c Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/9b

[2/4] tinkerpop git commit: Merge branch 'tp32' into tp33

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: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/78

[2/4] tinkerpop git commit: Merge branch 'tp32'

Merge branch 'tp32' Conflicts: docs/src/reference/the-traversal.asciidoc Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/abfa44fc Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/abfa44fc Diff: http

[2/4] tinkerpop git commit: Merge branch 'tp32'

Merge branch 'tp32' Conflicts: gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroovySackTest.groovy Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/5f865270

[2/4] tinkerpop git commit: Merge branch 'tp32'

Merge branch 'tp32' Conflicts: CHANGELOG.asciidoc gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/util/ServerGremlinExecutor.java Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/a7ee0

[2/4] tinkerpop git commit: Merge branch 'tp32'

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/a93bbf8f Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/a93bbf8f Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/a93bbf8f Br

[2/4] tinkerpop git commit: Merge branch 'tp32' into TINKERPOP-1507

Merge branch 'tp32' into TINKERPOP-1507 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/fc6ce291 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/fc6ce291 Diff: http://git-wip-us.apache.org/repos/asf/tinkerp