You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ab...@apache.org on 2016/11/29 14:31:26 UTC
[5/5] lucene-solr:feature/metrics: Merge branch 'master' into
feature/metrics
Merge branch 'master' into feature/metrics
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/540a73a6
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/540a73a6
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/540a73a6
Branch: refs/heads/feature/metrics
Commit: 540a73a6f66cc69ef3faf1830b243d1bd120b0b9
Parents: 497212e 70b3589
Author: Andrzej Bialecki <ab...@apache.org>
Authored: Tue Nov 29 15:30:51 2016 +0100
Committer: Andrzej Bialecki <ab...@apache.org>
Committed: Tue Nov 29 15:30:51 2016 +0100
----------------------------------------------------------------------
solr/CHANGES.txt | 2 +
solr/bin/solr | 80 ++++++++++++++++----
solr/bin/solr.cmd | 72 ++++++++++++++++--
solr/bin/solr.in.cmd | 6 +-
solr/bin/solr.in.sh | 4 +
.../apache/solr/search/mlt/CloudMLTQParser.java | 19 ++---
solr/server/etc/jetty-ssl.xml | 4 +-
.../solr/client/solrj/impl/CloudSolrClient.java | 4 +
8 files changed, 156 insertions(+), 35 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/540a73a6/solr/CHANGES.txt
----------------------------------------------------------------------
diff --cc solr/CHANGES.txt
index 6d2714c,422f1c6..7ab926d
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@@ -150,9 -150,8 +150,11 @@@ New Feature
runtime without the need to modify solrconfig from the default configuration. hl.useFastVectorHighlighter is now
considered deprecated in lieu of hl.method=fastVector. (Timothy Rodriguez, David Smiley)
+ * SOLR-9728: Ability to specify Key Store type in solr.in.sh file for SSL (Michael Suzuki, Kevin Risden)
+
+* SOLR-9788: Use instrumented jetty classes provided by the dropwizard metric library. This also introduces a
+ new /admin/metrics API endpoint to return all registered metrics in JSON format. (shalin)
+
Optimizations
----------------------
* SOLR-9704: Facet Module / JSON Facet API: Optimize blockChildren facets that have