Merge branch '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/fb7b1bb4 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/fb7b1bb4 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/fb7b1bb4 Branch: refs/heads/TINKERPOP-1443 Commit: fb7b1bb4296572c85700b4f1ed1526129532a1af Parents: aae93e8 5bba83c Author: Stephen Mallette <sp...@genoprime.com> Authored: Tue Feb 14 10:46:11 2017 -0500 Committer: Stephen Mallette <sp...@genoprime.com> Committed: Tue Feb 14 10:46:11 2017 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------