Merge remote-tracking branch 'origin/tp31' into tp32 Conflicts: giraph-gremlin/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-server/pom.xml gremlin-shaded/pom.xml gremlin-test/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/ecdccb41 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/ecdccb41 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/ecdccb41 Branch: refs/heads/master Commit: ecdccb413e562cd15a611d31efaa93744ce88809 Parents: 5a8496b 4d89454 Author: Stephen Mallette <sp...@genoprime.com> Authored: Thu Oct 20 18:53:41 2016 -0400 Committer: Stephen Mallette <sp...@genoprime.com> Committed: Thu Oct 20 18:53:41 2016 -0400 ---------------------------------------------------------------------- CHANGELOG.asciidoc | 1 + 1 file changed, 1 insertion(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ecdccb41/CHANGELOG.asciidoc ----------------------------------------------------------------------