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

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

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

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

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

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

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

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

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

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

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

Merge branch 'tp32' into tp33 Conflicts: gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/CoreImports.java gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/AbstractImportCustomizerProvider.java Project:

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

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

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

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

Merge branch 'tp32' into tp33 Conflicts: gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/branch/GroovyChooseTest.groovy Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit:

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

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

Merge branch 'tp32' into tp33 Conflicts: gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GroovyTranslatorTest.java Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/558e8147 Tree:

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

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

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

Merge branch 'tp32' into tp33 Conflicts: gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Order.java Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/71bc37fd Tree:

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

Merge branch 'tp32' into tp33 Conflicts: gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Order.java gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Pop.java Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo

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

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

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

Merge branch 'tp32' into tp33 Conflicts: gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyAddVertexTest.groovy gremlin-test/features/map/AddVertex.feature

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

Merge branch 'tp32' into tp33 Conflicts: gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineTest.java Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/012eba66

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

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

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

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

[3/3] 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

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

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

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

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

Merge branch 'tp32' into tp33 Conflicts: gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineCompileStaticTest.java gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineTypeCheckedTest.java

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

Merge branch 'tp32' into tp33 Conflicts: gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/AbstractGraphSONTypeSerializer.java gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapperPartialEmbeddedTypeTest.java

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