You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2015/08/25 14:35:00 UTC
[41/50] incubator-tinkerpop git commit: Merge remote-tracking branch
'origin/tp30'
Merge remote-tracking branch 'origin/tp30'
Conflicts:
gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/plugin/GephiRemoteAcceptor.groovy
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/6f85dd8f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/6f85dd8f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/6f85dd8f
Branch: refs/heads/tp30
Commit: 6f85dd8f59b12f03fbf5b3f180cac9fb1ae51277
Parents: dff781b 3a9e198
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Aug 20 16:15:23 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Aug 20 16:15:23 2015 -0400
----------------------------------------------------------------------
docs/src/gremlin-applications.asciidoc | 8 +-
.../console/commands/InstallCommand.groovy | 4 -
.../groovy/util/DependencyGrabber.groovy | 5 +-
.../gremlin/groovy/engine/ScriptEngines.java | 200 ++++++++++---------
.../jsr223/GremlinGroovyScriptEngine.java | 116 ++++++++++-
.../groovy/engine/ScriptEnginesTest.java | 78 ++++++++
6 files changed, 302 insertions(+), 109 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/6f85dd8f/docs/src/gremlin-applications.asciidoc
----------------------------------------------------------------------