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/12/30 15:57:04 UTC
[28/50] [abbrv] lucene-solr:jira/solr-9854: Merge branch 'master'
into jira/solr-9854
Merge branch 'master' into jira/solr-9854
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/2399185c
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/2399185c
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/2399185c
Branch: refs/heads/jira/solr-9854
Commit: 2399185c6d1da9003546e969b76379df17e67644
Parents: e1bf9b9 283b329
Author: Andrzej Bialecki <ab...@apache.org>
Authored: Wed Dec 28 11:35:31 2016 +0100
Committer: Andrzej Bialecki <ab...@apache.org>
Committed: Wed Dec 28 11:35:31 2016 +0100
----------------------------------------------------------------------
lucene/ivy-versions.properties | 3 +
.../lucene/spatial3d/geom/GeoBBoxFactory.java | 34 +-
.../lucene/spatial3d/geom/GeoCircleFactory.java | 2 +-
.../spatial3d/geom/GeoPolygonFactory.java | 6 +-
.../apache/lucene/spatial3d/geom/Vector.java | 4 +
solr/CHANGES.txt | 4 +
.../org/apache/solr/core/CoreContainer.java | 8 +-
.../component/HttpShardHandlerFactory.java | 65 ++-
.../solr/highlight/UnifiedSolrHighlighter.java | 448 +++++++++----------
.../metrics/reporters/SolrGangliaReporter.java | 144 ++++++
.../metrics/reporters/SolrGraphiteReporter.java | 129 ++++++
.../metrics/reporters/SolrSlf4jReporter.java | 127 ++++++
.../apache/solr/update/UpdateShardHandler.java | 65 ++-
.../stats/InstrumentedHttpRequestExecutor.java | 125 ++++++
...entedPoolingHttpClientConnectionManager.java | 113 +++++
.../test-files/solr/solr-gangliareporter.xml | 32 ++
.../test-files/solr/solr-graphitereporter.xml | 31 ++
.../src/test-files/solr/solr-slf4jreporter.xml | 35 ++
.../reporters/SolrGangliaReporterTest.java | 81 ++++
.../reporters/SolrGraphiteReporterTest.java | 115 +++++
.../reporters/SolrSlf4jReporterTest.java | 77 ++++
solr/licenses/gmetric4j-1.0.7.jar.sha1 | 1 +
solr/licenses/gmetric4j-LICENSE-BSD.txt | 31 ++
solr/licenses/gmetric4j-NOTICE.txt | 0
solr/licenses/metrics-ganglia-3.1.2.jar.sha1 | 1 +
solr/licenses/metrics-ganglia-LICENSE-ASL.txt | 203 +++++++++
solr/licenses/metrics-ganglia-NOTICE.txt | 12 +
solr/licenses/metrics-graphite-3.1.2.jar.sha1 | 1 +
solr/licenses/metrics-graphite-LICENSE-ASL.txt | 203 +++++++++
solr/licenses/metrics-graphite-NOTICE.txt | 12 +
solr/server/ivy.xml | 3 +
.../solr/client/solrj/impl/HttpClientUtil.java | 35 +-
32 files changed, 1880 insertions(+), 270 deletions(-)
----------------------------------------------------------------------