[4/6] 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/b757173b Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/b757173b Diff:

[4/6] 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/ae9d7f69 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/ae9d7f69 Diff:

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

Merge branch 'tp32' into tp33 Conflicts: docs/src/dev/developer/development-environment.asciidoc giraph-gremlin/pom.xml gremlin-archetype/gremlin-archetype-dsl/pom.xml gremlin-archetype/gremlin-archetype-server/pom.xml

[4/6] 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/a38d68f5 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/a38d68f5 Diff:

[4/6] 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/6aa5f2ee Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/6aa5f2ee Diff:

[4/6] 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/9a70e695 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/9a70e695 Diff:

[4/6] 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/510231ad Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/510231ad Diff:

[4/6] 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/53c84bdb Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/53c84bdb Diff:

[4/6] 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/99b6da25 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/99b6da25 Diff:

[4/6] 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/ae2935e4 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/ae2935e4 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/ae2935e4