Merge branch 'TINKERPOP-1953' into tp32
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/42ce7a5e Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/42ce7a5e Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/42ce7a5e Branch: refs/heads/master Commit: 42ce7a5e8491e247c617e3872963882357765a33 Parents: 8462f85 40dad27 Author: Stephen Mallette <[email protected]> Authored: Wed Apr 25 06:52:52 2018 -0400 Committer: Stephen Mallette <[email protected]> Committed: Wed Apr 25 06:52:52 2018 -0400 ---------------------------------------------------------------------- CHANGELOG.asciidoc | 1 + .../upgrade/release-3.2.x-incubating.asciidoc | 24 ++++++++++++++++++++ .../jsr223/GremlinGroovyScriptEngineTest.java | 9 ++++++++ pom.xml | 2 +- 4 files changed, 35 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
