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/05465d47 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/05465d47 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/05465d47 Branch: refs/heads/master Commit: 05465d4755f277ead3c352d08345e95a42c7e8e2 Parents: 8340ca7 2a2ecb0 Author: Stephen Mallette <sp...@genoprime.com> Authored: Tue Aug 29 08:34:33 2017 -0400 Committer: Stephen Mallette <sp...@genoprime.com> Committed: Tue Aug 29 08:34:33 2017 -0400 ---------------------------------------------------------------------- CHANGELOG.asciidoc | 2 ++ .../gremlin/jsr223/DefaultImportCustomizer.java | 25 ++++++++++++++++++++ .../jsr223/GremlinJythonScriptEngine.java | 2 +- .../tinkerpop/gremlin/server/Settings.java | 4 +++- .../neo4j/jsr223/Neo4jGremlinPlugin.java | 6 ++--- 5 files changed, 33 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/05465d47/CHANGELOG.asciidoc ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/05465d47/gremlin-python/src/main/java/org/apache/tinkerpop/gremlin/python/jsr223/GremlinJythonScriptEngine.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/05465d47/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/Settings.java ----------------------------------------------------------------------
