Merge branch 'TINKERPOP-1653' into tp32 Conflicts: CHANGELOG.asciidoc
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/a314c9c0 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/a314c9c0 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/a314c9c0 Branch: refs/heads/TINKERPOP-1625 Commit: a314c9c053c41c45327cf96fb49a901f9bc87631 Parents: 027433f c91bb19 Author: Stephen Mallette <sp...@genoprime.com> Authored: Thu Mar 23 15:20:08 2017 -0400 Committer: Stephen Mallette <sp...@genoprime.com> Committed: Thu Mar 23 15:20:08 2017 -0400 ---------------------------------------------------------------------- CHANGELOG.asciidoc | 1 + .../developer/development-environment.asciidoc | 8 ++ .../src/reference/gremlin-applications.asciidoc | 13 ++ .../upgrade/release-3.2.x-incubating.asciidoc | 15 ++ gremlin-console/pom.xml | 117 ++++++++++++++++ .../tinkerpop/gremlin/console/Console.groovy | 139 ++++++++++++------- gremlin-console/src/test/python/setup.cfg | 22 +++ gremlin-console/src/test/python/setup.py | 36 +++++ .../src/test/python/tests/__init__.py | 20 +++ .../src/test/python/tests/test_console.py | 95 +++++++++++++ gremlin-console/src/test/python/x.groovy | 20 +++ gremlin-console/src/test/python/y.groovy | 20 +++ gremlin-console/src/test/python/z.groovy | 20 +++ 13 files changed, 477 insertions(+), 49 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a314c9c0/CHANGELOG.asciidoc ---------------------------------------------------------------------- diff --cc CHANGELOG.asciidoc index b5cba15,6e0204b..367e3cc --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@@ -26,8 -26,7 +26,9 @@@ image::https://raw.githubusercontent.co TinkerPop 3.2.5 (Release Date: NOT OFFICIALLY RELEASED YET) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +* De-registered metrics on Gremlin Server shutdown. +* Added "help" command option on `:remote config` for plugins that support that feature in the Gremlin Console. + * Allowed for multiple scripts and related arguments to be passed to `gremlin.sh` via `-i` and `-e`. * Added various metrics to the `GremlinGroovyScriptEngine` around script compilation and exposed them in Gremlin Server. * Moved the `caffeine` dependency down to `gremlin-groovy` and out of `gremlin-server`. * Improved script compilation in `GremlinGroovyScriptEngine to use better caching, log long compile times and prevent failed compilations from recompiling on future requests.