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/65e8edb3 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/65e8edb3 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/65e8edb3 Branch: refs/heads/master Commit: 65e8edb38128f9b6a6093c0ff633b35e3b791289 Parents: 77de295 1820606 Author: Stephen Mallette <sp...@genoprime.com> Authored: Mon Jan 30 07:49:58 2017 -0500 Committer: Stephen Mallette <sp...@genoprime.com> Committed: Mon Jan 30 07:49:58 2017 -0500 ---------------------------------------------------------------------- CHANGELOG.asciidoc | 1 + .../groovy/jsr223/GremlinGroovyClassLoader.java | 24 ++++++++- .../jsr223/ManagedConcurrentValueMap.java | 4 ++ .../GremlinGroovyScriptEngineIntegrateTest.java | 55 ++++++++++++++++++++ 4 files changed, 82 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/65e8edb3/CHANGELOG.asciidoc ----------------------------------------------------------------------
