Merge branch 'TINKERPOP-1507' of https://github.com/apache/tinkerpop into tp32
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/ea8cd65c Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/ea8cd65c Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/ea8cd65c Branch: refs/heads/TINKERPOP-1235 Commit: ea8cd65ca933b36cbe3d47352d73d96ded3a7ad4 Parents: 16c7c24 2817c01 Author: Marko A. Rodriguez <[email protected]> Authored: Wed Oct 26 08:12:02 2016 -0600 Committer: Marko A. Rodriguez <[email protected]> Committed: Wed Oct 26 08:12:02 2016 -0600 ---------------------------------------------------------------------- CHANGELOG.asciidoc | 1 + docs/src/dev/io/graphson.asciidoc | 1 + .../structure/io/graphson/GraphSONModule.java | 4 +++ .../gremlin/structure/io/gryo/GryoMapper.java | 4 ++- .../tinkerpop/gremlin/util/CoreImports.java | 6 +++- .../step/branch/GroovyBranchTest.groovy | 13 ++++++++- .../step/branch/GroovyChooseTest.groovy | 10 +++++++ .../gremlin/groovy/jsr223/GroovyTranslator.java | 3 ++ .../gremlin/python/jsr223/PythonTranslator.java | 3 ++ .../jython/gremlin_python/process/traversal.py | 4 +++ .../traversal/step/branch/BranchTest.java | 29 ++++++++++++++++---- .../traversal/step/branch/ChooseTest.java | 19 +++++++++++++ 12 files changed, 89 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ea8cd65c/CHANGELOG.asciidoc ---------------------------------------------------------------------- diff --cc CHANGELOG.asciidoc index dc8da2e,d2cd065..74bfcef --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@@ -26,7 -26,7 +26,8 @@@ image::https://raw.githubusercontent.co TinkerPop 3.2.4 (Release Date: NOT OFFICIALLY RELEASED YET) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +* Deprecated the "performance" tests in `OptIn`. + * Added `Pick.none` and `Pick.any` to the serializers and importers. * Fixed a severe bug where `GraphComputer` strategies are not being loaded until the second use of the traversal source. [[release-3-2-3]]
