You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by cp...@apache.org on 2016/10/26 13:50:30 UTC
[26/26] lucene-solr:jira/solr-8542-v2: Merge branch 'master' into
jira/solr-8542-v2
Merge branch 'master' into jira/solr-8542-v2
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/be3b8434
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/be3b8434
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/be3b8434
Branch: refs/heads/jira/solr-8542-v2
Commit: be3b8434c2cd8a0ba799f36835fb32ce426f7a3e
Parents: 38052f3 feb1a5d
Author: Christine Poerschke <cp...@apache.org>
Authored: Wed Oct 26 08:33:51 2016 -0500
Committer: Christine Poerschke <cp...@apache.org>
Committed: Wed Oct 26 08:33:51 2016 -0500
----------------------------------------------------------------------
dev-tools/idea/solr/contrib/langid/langid.iml | 1 +
lucene/CHANGES.txt | 3 +
.../lucene70/Lucene70DocValuesProducer.java | 419 +++++++++++--------
.../codecs/lucene70/Lucene70NormsProducer.java | 231 +++++-----
.../java/org/apache/lucene/index/DocValues.java | 2 +-
.../DefaultSortedSetDocValuesReaderState.java | 3 +-
.../SortedSetDocValuesFacetCounts.java | 124 ++++--
.../facet/taxonomy/FastTaxonomyFacetCounts.java | 49 +++
.../lucene/facet/taxonomy/TaxonomyFacets.java | 4 +-
.../sortedset/TestSortedSetDocValuesFacets.java | 25 +-
.../facet/taxonomy/TestTaxonomyFacetCounts.java | 84 ++--
solr/CHANGES.txt | 38 +-
solr/bin/solr.cmd | 70 +++-
solr/bin/solr.in.cmd | 4 +
.../solr/handler/dataimport/DocBuilder.java | 2 +
.../handler/dataimport/TestDocBuilder2.java | 23 +
.../org/apache/solr/core/CoreContainer.java | 32 +-
.../backup/repository/HdfsBackupRepository.java | 9 +
.../apache/solr/handler/OldBackupDirectory.java | 2 +-
.../solr/handler/admin/SecurityConfHandler.java | 142 +++++--
.../handler/admin/SecurityConfHandlerLocal.java | 102 +++++
.../handler/admin/SecurityConfHandlerZk.java | 92 ++++
.../apache/solr/index/NoMergePolicyFactory.java | 34 ++
.../org/apache/solr/request/IntervalFacets.java | 12 +-
.../apache/solr/search/facet/FacetField.java | 1 +
.../solr/search/facet/FacetFieldMerger.java | 8 +-
.../solr/search/facet/FacetFieldProcessor.java | 22 +-
.../apache/solr/search/facet/FacetRequest.java | 1 +
.../apache/solr/security/BasicAuthPlugin.java | 14 +-
.../security/Sha256AuthenticationProvider.java | 2 +-
.../apache/solr/servlet/SolrDispatchFilter.java | 22 +-
.../TemplateUpdateProcessorFactory.java | 10 +-
.../src/java/org/apache/solr/util/SolrCLI.java | 223 +++++++---
.../conf/solrconfig-nomergepolicyfactory.xml | 32 ++
.../cloud/LeaderElectionContextKeyTest.java | 114 +++++
.../apache/solr/cloud/TestCloudRecovery.java | 154 +++++++
.../TestLeaderRecoverFromLogOnStartup.java | 77 ----
.../apache/solr/core/TestMergePolicyConfig.java | 20 +
.../apache/solr/handler/TestBlobHandler.java | 26 +-
.../solr/handler/TestHdfsBackupRestoreCore.java | 11 +
.../SecurityConfHandlerLocalForTesting.java | 43 ++
.../handler/admin/SecurityConfHandlerTest.java | 66 +--
.../solr/request/TestIntervalFaceting.java | 7 +-
.../solr/search/facet/TestJsonFacets.java | 37 ++
.../solr/security/BasicAuthIntegrationTest.java | 6 +-
.../solr/security/BasicAuthStandaloneTest.java | 220 ++++++++++
46 files changed, 1975 insertions(+), 648 deletions(-)
----------------------------------------------------------------------