Merge branch 'tp32'

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
        gremlin-console/bin/gremlin.sh
        gremlin-console/pom.xml
        gremlin-core/pom.xml
        gremlin-driver/pom.xml
        gremlin-groovy-test/pom.xml
        gremlin-groovy/pom.xml
        
gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/AbstractImportCustomizerProvider.java
        gremlin-python/pom.xml
        gremlin-server/pom.xml
        gremlin-shaded/pom.xml
        gremlin-test/pom.xml
        gremlin-tools/gremlin-benchmark/pom.xml
        hadoop-gremlin/pom.xml
        neo4j-gremlin/pom.xml
        pom.xml
        spark-gremlin/pom.xml
        tinkergraph-gremlin/pom.xml


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/3eace876
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/3eace876
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/3eace876

Branch: refs/heads/TINKERPOP-1686
Commit: 3eace8769167cfe9026e17ff2aedcad67ae7114b
Parents: b026ca3 3f7dbdc
Author: Stephen Mallette <[email protected]>
Authored: Mon Jun 19 06:39:29 2017 -0400
Committer: Stephen Mallette <[email protected]>
Committed: Mon Jun 19 06:39:29 2017 -0400

----------------------------------------------------------------------
 CHANGELOG.asciidoc                                |   9 +++++++++
 docs/src/dev/developer/for-committers.asciidoc    |   6 +++---
 docs/src/dev/developer/release.asciidoc           |  16 +++++++++++-----
 docs/src/reference/implementations-neo4j.asciidoc |   2 +-
 .../src/upgrade/release-3.2.x-incubating.asciidoc |  11 +++++++++++
 docs/static/images/gremlin-help-wanted.png        | Bin 0 -> 180643 bytes
 gremlin-console/src/assembly/standalone.xml       |  10 +++++-----
 .../apache/tinkerpop/gremlin/structure/Graph.java |  13 ++++++++-----
 .../io/graphson/GraphSONSerializersV2d0.java      |   9 ++++++---
 .../gremlin/structure/util/CloseableIterator.java |   2 +-
 gremlin-server/pom.xml                            |   2 +-
 .../computer/AbstractHadoopGraphComputer.java     |   2 +-
 .../tinkergraph/structure/TinkerGraph.java        |   5 +++++
 13 files changed, 62 insertions(+), 25 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3eace876/CHANGELOG.asciidoc
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3eace876/docs/src/dev/developer/for-committers.asciidoc
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3eace876/docs/src/dev/developer/release.asciidoc
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3eace876/docs/src/reference/implementations-neo4j.asciidoc
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3eace876/docs/src/upgrade/release-3.2.x-incubating.asciidoc
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3eace876/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Graph.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3eace876/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializersV2d0.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3eace876/gremlin-server/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3eace876/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraph.java
----------------------------------------------------------------------

Reply via email to