Merge branch 'master' into TINKERPOP-1278
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/fc5e2cbe Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/fc5e2cbe Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/fc5e2cbe Branch: refs/heads/TINKERPOP-1278 Commit: fc5e2cbef4e8ef9f784c98b366ba432dc24b3fdd Parents: 89785f4 9c56fa3 Author: Marko A. Rodriguez <okramma...@gmail.com> Authored: Thu Jun 2 14:04:59 2016 -0600 Committer: Marko A. Rodriguez <okramma...@gmail.com> Committed: Thu Jun 2 14:04:59 2016 -0600 ---------------------------------------------------------------------- CHANGELOG.asciidoc | 4 +-- README.asciidoc | 8 ++--- bin/publish-docs.sh | 15 ++++++++ docs/src/recipes/index.asciidoc | 2 +- .../reference/implementations-intro.asciidoc | 2 +- docs/src/reference/the-traversal.asciidoc | 2 +- .../tutorials/getting-started/index.asciidoc | 2 +- .../upgrade/release-3.1.x-incubating.asciidoc | 2 +- .../upgrade/release-3.2.x-incubating.asciidoc | 6 ++-- .../tinkerpop/gremlin/console/Console.groovy | 2 +- .../groovy/plugin/DriverRemoteAcceptor.java | 2 +- .../process/traversal/util/TraversalHelper.java | 2 +- .../ser/GryoLiteMessageSerializerV1d0.java | 10 +++++- .../driver/ser/GryoMessageSerializerV1d0.java | 22 ++++++++++-- .../step/branch/GroovyLocalTest.groovy | 8 +++++ .../traversal/step/branch/LocalTest.java | 38 +++++++++++++++++--- 16 files changed, 103 insertions(+), 24 deletions(-) ----------------------------------------------------------------------
