Merge remote-tracking branch 'origin/TINKERPOP-1322'
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/092dcb99 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/092dcb99 Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/092dcb99 Branch: refs/heads/TINKERPOP-1278 Commit: 092dcb991a2cdbfb310c5597e0942d9500402c31 Parents: dac7f11 e32347c Author: Stephen Mallette <sp...@genoprime.com> Authored: Mon Jun 6 06:25:13 2016 -0400 Committer: Stephen Mallette <sp...@genoprime.com> Committed: Mon Jun 6 06:25:13 2016 -0400 ---------------------------------------------------------------------- CHANGELOG.asciidoc | 1 + .../src/reference/gremlin-applications.asciidoc | 5 +- .../gremlin/groovy/engine/ScriptEngines.java | 28 ++++++- .../jsr223/GremlinGroovyScriptEngine.java | 8 +- .../ConfigurationCustomizerProvider.java | 83 ++++++++++++++++++++ .../groovy/jsr223/BaseScriptForTesting.java | 30 +++++++ .../GremlinGroovyScriptEngineConfigTest.java | 40 ++++++++++ .../ConfigurationCustomizerProviderTest.java | 78 ++++++++++++++++++ .../gremlin/server/BaseScriptForTesting.java | 30 +++++++ .../server/GremlinServerIntegrateTest.java | 50 +++++++++--- 10 files changed, 338 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/092dcb99/CHANGELOG.asciidoc ----------------------------------------------------------------------