You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by ok...@apache.org on 2015/12/07 17:00:53 UTC
[15/18] incubator-tinkerpop git commit: Merge remote-tracking branch
'origin/TINKERPOP3-860'
Merge remote-tracking branch 'origin/TINKERPOP3-860'
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/50de796e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/50de796e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/50de796e
Branch: refs/heads/TINKERPOP3-1014
Commit: 50de796e1128ab6ce5e7626dc285501ebb99af0b
Parents: 63a189c bdb8015
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Fri Dec 4 12:55:12 2015 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Fri Dec 4 12:55:12 2015 -0500
----------------------------------------------------------------------
.../src/test/resources/log4j-silent.properties | 7 +-
.../src/test/resources/log4j-silent.properties | 7 +-
.../src/test/resources/log4j-silent.properties | 7 +-
.../src/test/resources/log4j-silent.properties | 7 +-
.../GremlinGroovyScriptEngineOverGraphTest.java | 7 +-
.../gremlin/groovy/engine/ScriptEngines.java | 24 ++++-
.../jsr223/GremlinGroovyScriptEngine.java | 19 +++-
.../jsr223/ScriptEnginePluginAcceptor.java | 26 +++--
.../groovy/engine/ScriptEnginesTest.java | 99 ++++++++++++++++++++
.../jsr223/GremlinGroovyScriptEngineTest.java | 34 ++++++-
.../src/test/resources/log4j-silent.properties | 7 +-
.../src/test/resources/log4j-silent.properties | 7 +-
.../src/test/resources/log4j-silent.properties | 7 +-
.../structure/io/script/ScriptRecordReader.java | 3 +-
.../structure/io/script/ScriptRecordWriter.java | 3 +-
.../src/test/resources/log4j-silent.properties | 7 +-
.../src/test/resources/log4j-silent.properties | 7 +-
.../src/test/resources/log4j-silent.properties | 7 +-
.../src/test/resources/log4j-silent.properties | 7 +-
19 files changed, 259 insertions(+), 33 deletions(-)
----------------------------------------------------------------------