Merge remote-tracking branch 'origin/master' into TINKERPOP-1278
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/47e82d3b Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/47e82d3b Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/47e82d3b Branch: refs/heads/TINKERPOP-1278 Commit: 47e82d3b51c6f84f4d0ded95fa306afd743c1c70 Parents: 9cf493b 91d9c62 Author: Stephen Mallette <[email protected]> Authored: Fri Jul 22 11:58:18 2016 -0400 Committer: Stephen Mallette <[email protected]> Committed: Fri Jul 22 11:58:18 2016 -0400 ---------------------------------------------------------------------- CHANGELOG.asciidoc | 116 +++++++++++++++++-- README.asciidoc | 2 +- bin/publish-docs.sh | 2 +- bin/validate-distribution.sh | 18 +-- docs/javadoc/overview.html | 2 +- docs/src/dev/developer/administration.asciidoc | 5 - docs/src/dev/developer/contributing.asciidoc | 4 +- docs/src/dev/developer/for-committers.asciidoc | 20 ++-- docs/src/dev/developer/release.asciidoc | 60 ++++------ docs/src/recipes/index.asciidoc | 4 +- docs/src/reference/acknowledgements.asciidoc | 8 -- .../tutorials/getting-started/index.asciidoc | 4 +- .../upgrade/release-3.0.x-incubating.asciidoc | 8 +- .../upgrade/release-3.1.x-incubating.asciidoc | 12 +- .../upgrade/release-3.2.x-incubating.asciidoc | 8 +- giraph-gremlin/pom.xml | 2 +- .../gremlin-archetype-server/pom.xml | 2 +- .../archetype-resources/README.asciidoc | 2 +- .../gremlin-archetype-tinkergraph/pom.xml | 2 +- gremlin-archetype/pom.xml | 2 +- gremlin-benchmark/pom.xml | 2 +- gremlin-console/pom.xml | 2 +- gremlin-core/pom.xml | 2 +- .../step/filter/WherePredicateStep.java | 2 +- .../step/filter/WhereTraversalStep.java | 2 +- .../process/traversal/step/map/PathStep.java | 2 +- .../traversal/step/map/SelectOneStep.java | 2 +- .../process/traversal/step/map/SelectStep.java | 2 +- .../process/traversal/step/map/TreeStep.java | 2 +- .../step/sideEffect/TreeSideEffectStep.java | 2 +- .../optimization/RepeatUnrollStrategy.java | 4 +- .../gremlin/structure/io/gryo/GryoMapper.java | 3 + .../traversal/step/map/MatchStepTest.java | 10 +- .../optimization/RepeatUnrollStrategyTest.java | 28 ++--- gremlin-driver/pom.xml | 2 +- gremlin-groovy-test/pom.xml | 2 +- gremlin-groovy/pom.xml | 2 +- gremlin-server/pom.xml | 2 +- gremlin-server/src/main/static/LICENSE | 22 ++-- gremlin-shaded/pom.xml | 2 +- gremlin-test/pom.xml | 2 +- hadoop-gremlin/pom.xml | 2 +- neo4j-gremlin/pom.xml | 2 +- pom.xml | 8 +- spark-gremlin/pom.xml | 2 +- tinkergraph-gremlin/pom.xml | 2 +- .../structure/TinkerGraphPlayTest.java | 4 +- 47 files changed, 238 insertions(+), 164 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/47e82d3b/gremlin-console/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/47e82d3b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoMapper.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/47e82d3b/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/47e82d3b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphPlayTest.java ----------------------------------------------------------------------
