Merge branch 'TINKERPOP-1303' 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/027433f2
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/027433f2
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/027433f2
Branch: refs/heads/TINKERPOP-1625
Commit: 027433f222a3ef716144dca3725a28ca71f86064
Parents: b853a9a cf8b6b9
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Mar 23 14:29:19 2017 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Mar 23 14:29:19 2017 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
.../gremlin/console/jsr223/GephiRemoteAcceptor.groovy | 5 ++++-
.../gremlin/console/plugin/GephiRemoteAcceptor.groovy | 5 ++++-
.../gremlin/console/groovy/plugin/DriverRemoteAcceptor.java | 7 +++++--
.../gremlin/console/jsr223/DriverRemoteAcceptor.java | 7 +++++--
.../gremlin/hadoop/groovy/plugin/HadoopRemoteAcceptor.java | 4 ++++
.../tinkerpop/gremlin/hadoop/jsr223/HadoopRemoteAcceptor.java | 4 ++++
7 files changed, 27 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/027433f2/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --cc CHANGELOG.asciidoc
index 8ba4477,dca6f06..b5cba15
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@@ -26,7 -26,7 +26,8 @@@ 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.
* 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.
