Merge branch 'tp32'
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/1484c8de Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/1484c8de Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/1484c8de Branch: refs/heads/TINKERPOP-1235 Commit: 1484c8deb2438517b7fc12ec8a8ed154732cf47f Parents: 7a4b338 ea8cd65 Author: Marko A. Rodriguez <[email protected]> Authored: Wed Oct 26 08:12:17 2016 -0600 Committer: Marko A. Rodriguez <[email protected]> Committed: Wed Oct 26 08:12:17 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/1484c8de/CHANGELOG.asciidoc ----------------------------------------------------------------------
