You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by no...@apache.org on 2016/06/16 12:09:14 UTC

[44/50] [abbrv] lucene-solr:apiv2: Merge remote-tracking branch 'origin/master'

Merge remote-tracking branch 'origin/master'


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/ccf2070e
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/ccf2070e
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/ccf2070e

Branch: refs/heads/apiv2
Commit: ccf2070e53015a076867e850f7bdcfa03d25e7f4
Parents: 97e696d 82a9244
Author: Noble Paul <no...@apache.org>
Authored: Tue Jun 14 19:38:23 2016 +0530
Committer: Noble Paul <no...@apache.org>
Committed: Tue Jun 14 19:38:23 2016 +0530

----------------------------------------------------------------------
 dev-tools/scripts/addVersion.py                 |  34 +-
 lucene/CHANGES.txt                              |   6 +
 .../lucene/analysis/ar/ArabicAnalyzer.java      |   1 -
 .../charfilter/HTMLStripCharFilter.java         |   1 -
 .../analysis/charfilter/NormalizeCharMap.java   |   2 -
 .../lucene/analysis/ckb/SoraniAnalyzer.java     |   1 -
 .../HyphenationCompoundWordTokenFilter.java     |   1 -
 ...phenationCompoundWordTokenFilterFactory.java |   1 -
 .../lucene/analysis/core/LowerCaseFilter.java   |   3 +-
 .../lucene/analysis/core/StopAnalyzer.java      |   1 -
 .../lucene/analysis/core/UpperCaseFilter.java   |   3 +-
 .../analysis/el/GreekLowerCaseFilter.java       |   4 +-
 .../lucene/analysis/en/PorterStemmer.java       |   4 -
 .../lucene/analysis/fa/PersianAnalyzer.java     |   1 -
 .../lucene/analysis/hi/HindiAnalyzer.java       |   1 -
 .../lucene/analysis/minhash/MinHashFilter.java  | 504 +++++++++++++++++++
 .../analysis/minhash/MinHashFilterFactory.java  |  57 +++
 .../lucene/analysis/minhash/package-info.java   |  21 +
 .../WordDelimiterFilterFactory.java             |   2 -
 .../analysis/ngram/EdgeNGramTokenFilter.java    |   7 +-
 .../analysis/ngram/EdgeNGramTokenizer.java      |   1 -
 .../lucene/analysis/ngram/NGramTokenFilter.java |  13 +-
 .../lucene/analysis/ngram/NGramTokenizer.java   |   8 +-
 .../lucene/analysis/nl/DutchAnalyzer.java       |   1 -
 .../pattern/PatternCaptureGroupTokenFilter.java |   1 -
 .../query/QueryAutoStopWordAnalyzer.java        |   1 -
 .../analysis/standard/ClassicTokenizerImpl.java |   1 -
 .../standard/UAX29URLEmailTokenizerFactory.java |   1 -
 .../analysis/synonym/SynonymFilterFactory.java  |   2 -
 .../lucene/analysis/synonym/SynonymMap.java     |   2 -
 .../apache/lucene/analysis/th/ThaiAnalyzer.java |   1 -
 .../lucene/analysis/tr/TurkishAnalyzer.java     |   1 -
 .../lucene/analysis/util/CharArrayMap.java      |  17 +-
 .../lucene/analysis/util/CharTokenizer.java     |   5 +-
 .../lucene/analysis/util/CharacterUtils.java    | 229 ++-------
 .../analysis/wikipedia/WikipediaTokenizer.java  |   1 -
 .../lucene/collation/CollationKeyAnalyzer.java  |   2 -
 ...ache.lucene.analysis.util.TokenFilterFactory |   1 +
 .../lucene/analysis/ar/TestArabicAnalyzer.java  |   1 -
 .../ar/TestArabicNormalizationFilter.java       |   1 -
 .../bg/TestBulgarianStemFilterFactory.java      |   1 -
 .../analysis/br/TestBrazilianAnalyzer.java      |   1 -
 .../TestHTMLStripCharFilterFactory.java         |   1 -
 .../analysis/cjk/TestCJKWidthFilterFactory.java |   1 -
 .../lucene/analysis/ckb/TestSoraniAnalyzer.java |   1 -
 .../TestSoraniNormalizationFilterFactory.java   |   1 -
 .../commongrams/CommonGramsFilterTest.java      |   1 -
 .../TestCommonGramsQueryFilterFactory.java      |   3 -
 .../analysis/core/TestKeywordAnalyzer.java      |   1 -
 .../lucene/analysis/core/TestRandomChains.java  |   1 -
 .../de/TestGermanLightStemFilterFactory.java    |   1 -
 .../analysis/de/TestGermanStemFilter.java       |   1 -
 .../el/TestGreekLowerCaseFilterFactory.java     |   1 -
 .../analysis/el/TestGreekStemFilterFactory.java |   1 -
 .../en/TestEnglishMinimalStemFilterFactory.java |   1 -
 .../analysis/en/TestKStemFilterFactory.java     |   1 -
 .../en/TestPorterStemFilterFactory.java         |   1 -
 .../lucene/analysis/fa/TestPersianAnalyzer.java |   1 -
 .../TestPersianNormalizationFilterFactory.java  |   1 -
 .../fr/TestFrenchLightStemFilterFactory.java    |   1 -
 .../fr/TestFrenchMinimalStemFilterFactory.java  |   1 -
 .../ga/TestIrishLowerCaseFilterFactory.java     |   1 -
 .../TestGalicianMinimalStemFilterFactory.java   |   1 -
 .../gl/TestGalicianStemFilterFactory.java       |   1 -
 .../lucene/analysis/hi/TestHindiAnalyzer.java   |   1 -
 .../lucene/analysis/hi/TestHindiFilters.java    |   2 -
 .../lucene/analysis/hi/TestHindiNormalizer.java |   4 -
 .../hu/TestHungarianLightStemFilterFactory.java |   1 -
 .../analysis/hunspell/Test64kAffixes.java       |   2 -
 .../analysis/hunspell/TestAllDictionaries.java  |   1 -
 .../analysis/hunspell/TestAllDictionaries2.java |   1 -
 .../analysis/hunspell/TestDictionary.java       |   1 -
 .../hunspell/TestHunspellStemFilter.java        |   1 -
 .../it/TestItalianLightStemFilterFactory.java   |   1 -
 .../analysis/minhash/MinHashFilterTest.java     | 330 ++++++++++++
 .../miscellaneous/TestKeywordMarkerFilter.java  |   2 -
 .../TestStemmerOverrideFilter.java              |   4 +-
 .../miscellaneous/TestTrimFilterFactory.java    |   1 -
 .../no/TestNorwegianLightStemFilterFactory.java |   1 -
 .../TestPatternReplaceCharFilterFactory.java    |   1 -
 .../TestPatternReplaceFilterFactory.java        |   1 -
 .../DelimitedPayloadTokenFilterTest.java        |   4 -
 .../pt/TestPortugueseStemFilterFactory.java     |   1 -
 .../reverse/TestReverseStringFilterFactory.java |   1 -
 .../ru/TestRussianLightStemFilterFactory.java   |   1 -
 .../analysis/shingle/ShingleFilterTest.java     |   1 -
 .../shingle/TestShingleFilterFactory.java       |   1 -
 .../standard/TestStandardFactories.java         |   1 -
 .../lucene/analysis/th/TestThaiAnalyzer.java    |   1 -
 .../analysis/util/TestCharacterUtils.java       | 155 +-----
 .../collation/ICUCollationKeyAnalyzer.java      |   3 -
 .../icu/TestICUFoldingFilterFactory.java        |   1 -
 .../icu/TestICUNormalizer2FilterFactory.java    |   1 -
 .../icu/TestICUTransformFilterFactory.java      |   1 -
 .../segmentation/TestICUTokenizerFactory.java   |   1 -
 .../analysis/ja/dict/ConnectionCosts.java       |   1 -
 .../lucene/analysis/ja/dict/UserDictionary.java |   1 -
 .../analysis/morfologik/MorfologikFilter.java   |   4 +-
 .../TestDoubleMetaphoneFilterFactory.java       |   3 -
 .../TestStempelPolishStemFilterFactory.java     |   1 -
 .../uima/UIMAAnnotationsTokenizerFactory.java   |   1 -
 .../lucene/analysis/uima/UIMABaseAnalyzer.java  |   1 -
 ...IMATypeAwareAnnotationsTokenizerFactory.java |   1 -
 .../uima/UIMATypeAwareAnalyzerTest.java         |   1 -
 .../lucene50/Lucene50SegmentInfoFormat.java     |   4 -
 .../lucene50/Lucene50RWSegmentInfoFormat.java   |   4 -
 .../benchmark/byTask/tasks/AddIndexesTask.java  |   3 -
 .../byTask/tasks/NearRealtimeReaderTask.java    |   1 -
 .../benchmark/byTask/tasks/OpenReaderTask.java  |   1 -
 .../lucene/benchmark/byTask/tasks/ReadTask.java |   1 -
 .../byTask/tasks/ReopenReaderTask.java          |   1 -
 .../byTask/tasks/RollbackIndexTask.java         |   2 -
 .../byTask/tasks/WriteEnwikiLineDocTask.java    |   1 -
 .../benchmark/quality/utils/SimpleQQParser.java |   1 -
 .../tasks/WriteEnwikiLineDocTaskTest.java       |   4 -
 .../lucene/classification/Classifier.java       |   4 -
 .../SimpleNaiveBayesDocumentClassifier.java     |   2 -
 .../classification/utils/DatasetSplitter.java   |   2 -
 .../SimpleNaiveBayesClassifierTest.java         |   1 -
 .../utils/DocToDoubleVectorUtilsTest.java       |   2 -
 .../codecs/blockterms/BlockTermsReader.java     |   1 -
 .../blocktreeords/OrdsIntersectTermsEnum.java   |   2 -
 .../blocktreeords/OrdsSegmentTermsEnum.java     |   2 -
 .../lucene/codecs/memory/FSTOrdTermsReader.java |   1 -
 .../simpletext/SimpleTextFieldsReader.java      |   1 -
 .../simpletext/SimpleTextLiveDocsFormat.java    |   2 -
 .../simpletext/SimpleTextTermVectorsReader.java |   1 -
 .../java/org/apache/lucene/analysis/Token.java  |   1 -
 .../org/apache/lucene/codecs/NormsConsumer.java |   2 -
 .../lucene/codecs/StoredFieldsWriter.java       |   1 -
 .../apache/lucene/codecs/TermVectorsWriter.java |   1 -
 .../codecs/lucene50/Lucene50PostingsFormat.java |   1 -
 .../lucene62/Lucene62SegmentInfoFormat.java     |   1 -
 .../org/apache/lucene/index/DocIDMerger.java    |   2 -
 .../apache/lucene/index/DocumentsWriter.java    |  40 +-
 .../index/DocumentsWriterPerThreadPool.java     |   5 +-
 .../org/apache/lucene/index/IndexWriter.java    |  10 +-
 .../apache/lucene/index/IndexWriterConfig.java  |   1 -
 .../lucene/index/MappingMultiPostingsEnum.java  |   2 -
 .../org/apache/lucene/index/MergePolicy.java    |   2 -
 .../org/apache/lucene/index/MergeState.java     |   1 -
 .../org/apache/lucene/index/MultiSorter.java    |   1 -
 .../index/TermVectorsConsumerPerField.java      |   1 -
 .../apache/lucene/index/TermsHashPerField.java  |   1 -
 .../apache/lucene/search/BlendedTermQuery.java  |   1 -
 .../apache/lucene/search/ConjunctionDISI.java   | 188 +++----
 .../apache/lucene/search/ConjunctionScorer.java |   4 +-
 .../search/ControlledRealTimeReopenThread.java  |   3 +-
 .../EarlyTerminatingSortingCollector.java       |   1 -
 .../apache/lucene/search/ExactPhraseScorer.java |   3 +-
 .../apache/lucene/search/FuzzyTermsEnum.java    |   1 -
 .../java/org/apache/lucene/search/Multiset.java |   2 -
 .../apache/lucene/search/PointInSetQuery.java   |   6 -
 .../org/apache/lucene/search/RegexpQuery.java   |   1 -
 .../lucene/search/SloppyPhraseScorer.java       |   3 +-
 .../apache/lucene/search/TwoPhaseIterator.java  |  79 +--
 .../lucene/store/ByteArrayIndexInput.java       |   2 -
 .../org/apache/lucene/util/CharsRefBuilder.java |   1 -
 .../automaton/DaciukMihovAutomatonBuilder.java  |   1 -
 .../lucene/util/mutable/MutableValueStr.java    |   1 -
 .../util/packed/MonotonicBlockPackedWriter.java |   1 -
 .../lucene/util/packed/MonotonicLongValues.java |   1 -
 .../lucene54/TestLucene54DocValuesFormat.java   |   2 -
 .../apache/lucene/document/TestFieldType.java   |   2 -
 .../org/apache/lucene/index/Test2BPoints.java   |   6 -
 .../index/TestBinaryDocValuesUpdates.java       |   2 -
 .../org/apache/lucene/index/TestCodecs.java     |   5 -
 .../lucene/index/TestDirectoryReader.java       |   1 -
 .../apache/lucene/index/TestDocIDMerger.java    |   2 -
 .../lucene/index/TestDocsAndPositions.java      |   1 -
 .../apache/lucene/index/TestFieldsReader.java   |   1 -
 .../lucene/index/TestIndexFileDeleter.java      |   4 -
 .../org/apache/lucene/index/TestIndexInput.java |   4 -
 .../apache/lucene/index/TestIndexSorting.java   |   7 -
 .../apache/lucene/index/TestIndexWriter.java    |   3 -
 .../lucene/index/TestIndexWriterCommit.java     |   1 -
 .../lucene/index/TestIndexWriterConfig.java     |   1 -
 .../lucene/index/TestIndexWriterForceMerge.java |   4 -
 .../lucene/index/TestIndexWriterFromReader.java |   1 -
 .../index/TestIndexWriterLockRelease.java       |   2 -
 .../lucene/index/TestIndexWriterOnDiskFull.java |   2 -
 .../index/TestIndexingSequenceNumbers.java      |   2 -
 .../lucene/index/TestMergeRateLimiter.java      |   2 -
 .../lucene/index/TestMixedDocValuesUpdates.java |   1 -
 .../apache/lucene/index/TestMultiTermsEnum.java |   1 -
 .../apache/lucene/index/TestNeverDelete.java    |   2 -
 .../apache/lucene/index/TestNoMergePolicy.java  |   1 -
 .../index/TestNumericDocValuesUpdates.java      |   2 -
 .../apache/lucene/index/TestOmitPositions.java  |   1 -
 .../org/apache/lucene/index/TestOmitTf.java     |   2 -
 .../index/TestParallelCompositeReader.java      |   2 -
 .../lucene/index/TestParallelTermEnum.java      |   1 -
 .../org/apache/lucene/index/TestPayloads.java   |   1 -
 .../lucene/index/TestPerSegmentDeletes.java     |   2 -
 .../TestPersistentSnapshotDeletionPolicy.java   |   1 -
 .../apache/lucene/index/TestReaderClosed.java   |   1 -
 .../apache/lucene/index/TestSegmentInfos.java   |   1 -
 .../index/TestSnapshotDeletionPolicy.java       |   2 -
 .../lucene/search/TestConjunctionDISI.java      |  12 +-
 .../TestControlledRealTimeReopenThread.java     |  20 +-
 .../TestEarlyTerminatingSortingCollector.java   |   6 -
 .../apache/lucene/search/TestIndexSearcher.java |   1 -
 .../lucene/search/TestMatchNoDocsQuery.java     |   1 -
 .../apache/lucene/search/TestPhraseQuery.java   |   1 -
 .../apache/lucene/search/TestRegexpRandom2.java |   1 -
 .../apache/lucene/search/TestScorerPerf.java    |   2 -
 .../lucene/search/TestSimilarityProvider.java   |   1 -
 .../lucene/store/TestBufferedIndexInput.java    |   1 -
 .../org/apache/lucene/store/TestDirectory.java  |   1 -
 .../lucene/store/TestFileSwitchDirectory.java   |   1 -
 .../apache/lucene/store/TestRateLimiter.java    |   1 -
 .../lucene/store/TestSimpleFSLockFactory.java   |   1 -
 .../apache/lucene/util/Test2BPagedBytes.java    |   1 -
 .../org/apache/lucene/util/TestIOUtils.java     |   1 -
 .../util/TestRecyclingByteBlockAllocator.java   |   1 -
 .../util/TestRecyclingIntBlockAllocator.java    |   1 -
 .../automaton/FiniteStringsIteratorTest.java    |   1 -
 .../LimitedFiniteStringsIteratorTest.java       |   1 -
 .../test/org/apache/lucene/demo/TestDemo.java   |   2 -
 .../TestExpressionAggregationFacetsExample.java |   3 -
 .../demo/facet/TestRangeFacetsExample.java      |   2 -
 .../facet/TestSimpleSortedSetFacetsExample.java |   1 -
 .../lucene/expressions/js/JavascriptLexer.java  |   3 -
 .../lucene/expressions/js/JavascriptParser.java |   3 -
 .../DefaultSortedSetDocValuesReaderState.java   |   1 -
 .../lucene/facet/taxonomy/TestFacetLabel.java   |   2 -
 .../taxonomy/directory/TestAddTaxonomy.java     |  14 -
 .../grouping/AbstractGroupFacetCollector.java   |   1 -
 .../highlight/OffsetLimitTokenFilterTest.java   |   1 -
 .../vectorhighlight/IndexTimeSynonymTest.java   |   4 -
 .../search/join/ToParentBlockJoinQuery.java     |   2 -
 .../lucene/search/join/TestBlockJoin.java       |   1 -
 .../apache/lucene/index/memory/MemoryIndex.java |   2 +-
 .../lucene/index/memory/TestMemoryIndex.java    |   6 -
 .../memory/TestMemoryIndexAgainstRAMDir.java    |   1 -
 .../lucene/index/MultiPassIndexSplitter.java    |   1 -
 .../index/TestMultiPassIndexSplitter.java       |   1 -
 .../search/TestDiversifiedTopDocsCollector.java |   1 -
 .../apache/lucene/util/fst/TestFSTsMisc.java    |   1 -
 .../lucene/queries/function/BoostedQuery.java   |   1 -
 .../function/valuesource/DoubleFieldSource.java |   1 -
 .../SumTotalTermFreqValueSource.java            |   1 -
 .../apache/lucene/queries/TermsQueryTest.java   |   2 -
 .../queries/TestCustomScoreExplanations.java    |   1 -
 .../lucene/queryparser/classic/QueryParser.java |   3 +-
 .../lucene/queryparser/classic/QueryParser.jj   |   2 +-
 .../classic/QueryParserTokenManager.java        |  10 -
 .../queryparser/ext/ExtendableQueryParser.java  |   1 -
 .../flexible/standard/StandardQueryParser.java  |   2 +-
 .../builders/DummyQueryNodeBuilder.java         |   1 -
 .../StandardSyntaxParserTokenManager.java       |  22 -
 .../MultiFieldQueryNodeProcessor.java           |   1 -
 .../StandardQueryNodeProcessorPipeline.java     |   3 -
 .../surround/parser/QueryParser.java            |   2 -
 .../parser/QueryParserTokenManager.java         |  13 -
 .../queryparser/classic/TestMultiAnalyzer.java  |   2 -
 .../classic/TestMultiPhraseQueryParsing.java    |   1 -
 .../precedence/TestPrecedenceQueryParser.java   |   1 -
 .../standard/TestMultiAnalyzerQPHelper.java     |   3 -
 .../flexible/standard/TestStandardQP.java       |   2 -
 .../simple/TestSimpleQueryParser.java           |   1 -
 .../xml/TestQueryTemplateManager.java           |   1 -
 .../lucene/replicator/nrt/CopyOneFile.java      |   2 -
 .../apache/lucene/replicator/nrt/CopyState.java |   1 -
 .../org/apache/lucene/replicator/nrt/Node.java  |  10 -
 .../replicator/nrt/ReplicaFileDeleter.java      |   2 -
 .../nrt/SegmentInfosSearcherManager.java        |   1 -
 .../IndexAndTaxonomyRevisionTest.java           |   1 -
 .../lucene/replicator/IndexRevisionTest.java    |   1 -
 .../lucene/replicator/LocalReplicatorTest.java  |   1 -
 .../lucene/replicator/ReplicatorTestCase.java   |   2 -
 .../lucene/replicator/nrt/Connection.java       |   2 -
 .../org/apache/lucene/replicator/nrt/Jobs.java  |   2 -
 .../lucene/replicator/nrt/SimpleCopyJob.java    |  35 --
 .../lucene/replicator/nrt/SimpleTransLog.java   |   3 -
 .../replicator/nrt/TestNRTReplication.java      |   1 -
 .../nrt/TestStressNRTReplication.java           |   1 -
 .../idversion/IDVersionPostingsReader.java      |   1 -
 .../idversion/IDVersionSegmentTermsEnum.java    |   1 -
 .../sandbox/queries/SlowFuzzyTermsEnum.java     |   1 -
 .../search/TokenStreamToTermAutomatonQuery.java |   2 -
 lucene/site/changes/changes2html.pl             |   4 +-
 lucene/site/xsl/index.xsl                       |  14 +-
 .../org/apache/lucene/spatial3d/Geo3DPoint.java |   9 -
 .../spatial3d/geom/GeoComplexPolygon.java       |   2 -
 .../lucene/spatial3d/geom/StandardXYZSolid.java |   2 -
 .../apache/lucene/spatial3d/TestGeo3DPoint.java |   1 -
 .../lucene/spatial3d/geom/GeoPolygonTest.java   |   2 -
 .../lucene/search/spell/DirectSpellChecker.java |   2 -
 .../lucene/search/spell/LuceneDictionary.java   |   1 -
 .../search/spell/WordBreakSpellChecker.java     |   1 -
 .../analyzing/AnalyzingInfixSuggester.java      |   1 -
 .../search/suggest/analyzing/FSTUtil.java       |   1 -
 .../suggest/analyzing/SuggestStopFilter.java    |   1 -
 .../suggest/fst/FSTCompletionBuilder.java       |   1 -
 .../search/suggest/jaspell/JaspellLookup.java   |   1 -
 .../search/suggest/FileDictionaryTest.java      |   1 -
 .../lucene/search/suggest/PersistenceTest.java  |   1 -
 .../analyzing/AnalyzingInfixSuggesterTest.java  |   2 -
 .../analyzing/AnalyzingSuggesterTest.java       |   1 -
 .../suggest/analyzing/FuzzySuggesterTest.java   |   1 -
 .../search/suggest/fst/FSTCompletionTest.java   |   1 -
 .../search/suggest/fst/WFSTCompletionTest.java  |   1 -
 .../lucene/analysis/CollationTestBase.java      |   1 -
 .../apache/lucene/analysis/MockAnalyzer.java    |   1 -
 .../apache/lucene/analysis/MockCharFilter.java  |   1 -
 .../lucene/analysis/MockPayloadAnalyzer.java    |   1 -
 .../codecs/asserting/AssertingPointsFormat.java |   1 -
 .../codecs/cranky/CrankyPointsFormat.java       |   3 -
 .../mockrandom/MockRandomPostingsFormat.java    |   1 -
 .../index/BaseTermVectorsFormatTestCase.java    |   2 -
 .../java/org/apache/lucene/index/DocHelper.java |   1 -
 .../apache/lucene/index/ForceMergePolicy.java   |   3 -
 .../ThreadedIndexingAndSearchingTestCase.java   |   1 -
 .../lucene/mockfile/MockFileSystemTestCase.java |   1 -
 .../org/apache/lucene/mockfile/WindowsFS.java   |   4 -
 .../lucene/store/BaseLockFactoryTestCase.java   |   1 -
 .../apache/lucene/util/CloseableDirectory.java  |   1 -
 .../org/apache/lucene/util/LineFileDocs.java    |   1 -
 .../analysis/TestLookaheadTokenFilter.java      |   1 -
 .../TestCompressingStoredFieldsFormat.java      |   4 -
 .../TestCompressingTermVectorsFormat.java       |   1 -
 .../lucene/index/TestAssertingLeafReader.java   |   8 -
 .../lucene/mockfile/TestHandleTrackingFS.java   |   4 -
 .../apache/lucene/mockfile/TestWindowsFS.java   |   2 -
 .../lucene/store/TestMockDirectoryWrapper.java  |   4 -
 lucene/tools/javadoc/ecj.javadocs.prefs         |   2 +-
 solr/CHANGES.txt                                |  28 +-
 .../solr/schema/TestICUCollationField.java      |   2 -
 .../analytics/facet/FieldFacetExtrasTest.java   |   1 -
 .../solr/analytics/facet/FieldFacetTest.java    |   1 -
 .../handler/dataimport/DIHCacheSupport.java     |   3 -
 .../handler/dataimport/DataImportHandler.java   |   6 -
 .../solr/handler/dataimport/DebugInfo.java      |   1 -
 .../solr/handler/dataimport/Evaluator.java      |   5 -
 .../solr/handler/dataimport/UrlEvaluator.java   |   1 -
 .../dataimport/XPathEntityProcessor.java        |   1 -
 .../apache/solr/handler/dataimport/Zipper.java  |   1 -
 .../dataimport/config/ConfigParseUtil.java      |   6 -
 .../solr/handler/dataimport/TestDataConfig.java |   1 -
 .../solr/handler/dataimport/TestDocBuilder.java |   1 -
 .../handler/dataimport/TestEphemeralCache.java  |   1 -
 .../dataimport/TestFileListEntityProcessor.java |   1 -
 .../TestFileListWithLineEntityProcessor.java    |   1 -
 .../dataimport/TestHierarchicalDocBuilder.java  |   1 -
 .../dataimport/TestNonWritablePersistFile.java  |   1 -
 .../TestPlainTextEntityProcessor.java           |   1 -
 .../dataimport/TestScriptTransformer.java       |   2 -
 .../dataimport/TestSimplePropertiesWriter.java  |   2 -
 .../dataimport/TestSqlEntityProcessorDelta.java |   1 -
 ...anguageIdentifierUpdateProcessorFactory.java |   1 -
 .../LanguageIdentifierUpdateProcessor.java      |   1 -
 .../solr/hadoop/MapReduceIndexerTool.java       |   3 -
 .../apache/solr/hadoop/SolrOutputFormat.java    |   1 -
 .../apache/solr/hadoop/MorphlineMapperTest.java |   1 -
 .../src/java/org/apache/solr/cloud/Assign.java  |   1 -
 .../org/apache/solr/cloud/DistributedMap.java   |   1 -
 .../solr/cloud/OverseerTaskProcessor.java       |   2 -
 .../apache/solr/cloud/OverseerTaskQueue.java    |   1 -
 .../solr/cloud/SizeLimitedDistributedMap.java   |   2 -
 .../apache/solr/cloud/overseer/NodeMutator.java |   1 -
 .../solr/cloud/overseer/OverseerAction.java     |   2 -
 .../solr/cloud/overseer/SliceMutator.java       |   2 -
 .../solr/cloud/overseer/ZkStateWriter.java      |   2 -
 .../apache/solr/cloud/rule/ReplicaAssigner.java |   1 -
 .../org/apache/solr/core/BlobRepository.java    |   6 -
 .../solr/core/CachingDirectoryFactory.java      |   6 +-
 .../org/apache/solr/core/ConfigOverlay.java     |   4 -
 .../org/apache/solr/core/ConfigSetService.java  |   1 -
 .../org/apache/solr/core/CoreContainer.java     |   1 -
 .../org/apache/solr/core/DirectoryFactory.java  |  25 +
 .../apache/solr/core/HdfsDirectoryFactory.java  |  33 +-
 .../solr/core/SimpleFSDirectoryFactory.java     |   1 -
 .../src/java/org/apache/solr/core/SolrCore.java |   1 -
 .../java/org/apache/solr/core/SolrCores.java    |   2 -
 .../solr/handler/ContentStreamHandlerBase.java  |   1 -
 .../org/apache/solr/handler/GraphHandler.java   |   2 -
 .../solr/handler/MoreLikeThisHandler.java       |   2 -
 .../apache/solr/handler/RealTimeGetHandler.java |   1 -
 .../apache/solr/handler/ReplicationHandler.java |   3 +-
 .../apache/solr/handler/RequestHandlerBase.java |   2 -
 .../solr/handler/admin/ConfigSetsHandler.java   |   1 -
 .../solr/handler/admin/CoreAdminHandler.java    |   2 -
 .../solr/handler/admin/CoreAdminOperation.java  |   2 +-
 .../handler/admin/ShowFileRequestHandler.java   |   2 -
 .../handler/admin/SolrInfoMBeanHandler.java     |   1 -
 .../handler/component/HighlightComponent.java   |   1 -
 .../solr/handler/component/QueryComponent.java  |   2 -
 .../handler/component/RealTimeGetComponent.java |   1 -
 .../handler/component/SpellCheckComponent.java  |   2 -
 .../handler/component/SpellCheckMergeData.java  |   1 -
 .../handler/component/StatsValuesFactory.java   |   3 -
 .../solr/handler/component/TermsComponent.java  |   1 -
 .../apache/solr/handler/loader/JsonLoader.java  |   2 -
 .../solr/highlight/PostingsSolrHighlighter.java |   1 -
 .../solr/index/SlowCompositeReaderWrapper.java  |   1 -
 .../apache/solr/index/SortingMergePolicy.java   |  21 -
 .../org/apache/solr/internal/csv/CSVParser.java |   2 -
 .../apache/solr/internal/csv/CSVPrinter.java    |   2 -
 .../org/apache/solr/parser/QueryParser.java     |   6 -
 .../solr/parser/QueryParserTokenManager.java    |  13 -
 .../apache/solr/parser/SolrQueryParserBase.java |   1 -
 .../apache/solr/request/SolrRequestInfo.java    |   1 -
 .../org/apache/solr/request/json/JSONUtil.java  |   6 -
 .../apache/solr/request/json/ObjectUtil.java    |   3 -
 .../solr/response/BinaryResponseWriter.java     |   1 -
 .../solr/response/GeoJSONResponseWriter.java    |   1 -
 .../solr/response/JSONResponseWriter.java       |   5 -
 .../response/PHPSerializedResponseWriter.java   |   1 -
 .../org/apache/solr/response/ResultContext.java |   1 -
 .../transform/ExcludedMarkerFactory.java        |   2 -
 .../org/apache/solr/rest/SolrSchemaRestApi.java |   2 -
 .../schema/analysis/ManagedWordSetResource.java |   1 -
 .../solr/schema/JsonPreAnalyzedParser.java      |   1 -
 .../solr/schema/ManagedIndexSchemaFactory.java  |   2 -
 .../solr/search/CollapsingQParserPlugin.java    |   1 -
 .../apache/solr/search/DisMaxQParserPlugin.java |   1 -
 .../java/org/apache/solr/search/DocSlice.java   |   1 -
 .../search/ExtendedDismaxQParserPlugin.java     |   1 -
 .../apache/solr/search/FieldQParserPlugin.java  |   1 -
 .../solr/search/FunctionQParserPlugin.java      |   1 -
 .../solr/search/FunctionRangeQParserPlugin.java |   1 -
 .../apache/solr/search/JoinQParserPlugin.java   |   1 -
 .../java/org/apache/solr/search/LRUCache.java   |   1 -
 .../apache/solr/search/LuceneQParserPlugin.java |   2 -
 .../solr/search/OldLuceneQParserPlugin.java     |   1 -
 .../apache/solr/search/PrefixQParserPlugin.java |   3 -
 .../java/org/apache/solr/search/QParser.java    |   1 -
 .../org/apache/solr/search/QueryContext.java    |   1 -
 .../org/apache/solr/search/QueryParsing.java    |   3 -
 .../apache/solr/search/RawQParserPlugin.java    |   1 -
 .../apache/solr/search/ReRankQParserPlugin.java |   1 -
 .../apache/solr/search/SimpleQParserPlugin.java |   1 -
 .../apache/solr/search/SolrFieldCacheMBean.java |   1 -
 .../org/apache/solr/search/SolrQueryParser.java |  18 -
 .../apache/solr/search/SolrReturnFields.java    |   1 -
 .../solr/search/SpatialBoxQParserPlugin.java    |   1 -
 .../solr/search/SpatialFilterQParserPlugin.java |   1 -
 .../solr/search/SurroundQParserPlugin.java      |   1 -
 .../apache/solr/search/TermQParserPlugin.java   |   1 -
 .../apache/solr/search/TermsQParserPlugin.java  |   1 -
 .../apache/solr/search/XmlQParserPlugin.java    |   1 -
 .../solr/search/facet/AggValueSource.java       |   1 -
 .../org/apache/solr/search/facet/BlockJoin.java |   1 -
 .../apache/solr/search/facet/FacetField.java    |   1 -
 .../facet/FacetFieldProcessorNumeric.java       |   1 -
 .../apache/solr/search/facet/FacetRequest.java  |   2 -
 .../org/apache/solr/search/facet/FieldUtil.java |   2 -
 .../org/apache/solr/search/facet/HLLAgg.java    |   5 -
 .../apache/solr/search/facet/LegacyFacet.java   |   1 -
 .../solr/search/facet/SimpleAggValueSource.java |   3 -
 .../org/apache/solr/search/facet/SlotAcc.java   |   8 -
 .../solr/search/facet/StrAggValueSource.java    |   7 -
 .../solr/search/facet/UnInvertedField.java      |   1 -
 .../solr/search/function/FileFloatSource.java   |   1 -
 .../apache/solr/search/grouping/Command.java    |   2 -
 .../SearchGroupsResultTransformer.java          |   2 -
 .../join/BlockJoinParentQParserPlugin.java      |   1 -
 .../solr/search/join/GraphQParserPlugin.java    |   1 -
 .../org/apache/solr/search/join/GraphQuery.java |   3 -
 .../solr/search/join/GraphQueryParser.java      |   1 -
 .../search/join/ScoreJoinQParserPlugin.java     |   1 -
 .../solr/search/mlt/MLTQParserPlugin.java       |   1 -
 .../SweetSpotSimilarityFactory.java             |   1 -
 .../apache/solr/search/stats/LRUStatsCache.java |   5 -
 .../solr/security/AuthorizationContext.java     |   1 -
 .../security/AutorizationEditOperation.java     |   2 -
 .../apache/solr/security/KerberosPlugin.java    |   1 -
 .../security/RuleBasedAuthorizationPlugin.java  |   2 -
 .../solr/servlet/DirectSolrConnection.java      |   6 -
 .../org/apache/solr/servlet/HttpSolrCall.java   |   5 -
 .../solr/servlet/cache/HttpCacheHeaderUtil.java |   2 -
 .../spelling/AbstractLuceneSpellChecker.java    |   6 -
 .../solr/spelling/DirectSolrSpellChecker.java   |   6 -
 .../solr/store/blockcache/BlockCache.java       |   1 -
 .../apache/solr/store/blockcache/Metrics.java   |   1 -
 .../solr/update/DeleteByQueryWrapper.java       |   1 -
 .../apache/solr/update/DeleteUpdateCommand.java |   2 -
 ...tractDefaultValueUpdateProcessorFactory.java |   2 -
 .../CountFieldValuesUpdateProcessorFactory.java |  10 -
 .../DefaultValueUpdateProcessorFactory.java     |   4 -
 .../DistributingUpdateProcessorFactory.java     |   2 -
 .../FieldMutatingUpdateProcessorFactory.java    |   1 -
 .../FieldValueSubsetUpdateProcessorFactory.java |   2 -
 .../FirstFieldValueUpdateProcessorFactory.java  |   1 -
 .../LastFieldValueUpdateProcessorFactory.java   |   1 -
 .../solr/update/processor/MD5Signature.java     |   1 -
 .../MaxFieldValueUpdateProcessorFactory.java    |   1 -
 .../MinFieldValueUpdateProcessorFactory.java    |   1 -
 .../NoOpDistributingUpdateProcessorFactory.java |   2 -
 .../ParseDateFieldUpdateProcessorFactory.java   |   2 -
 .../update/processor/RegexpBoostProcessor.java  |   1 -
 .../processor/RunUpdateProcessorFactory.java    |   1 -
 .../TimestampUpdateProcessorFactory.java        |   7 -
 .../processor/TolerantUpdateProcessor.java      |   6 -
 .../TolerantUpdateProcessorFactory.java         |   1 -
 .../UniqFieldsUpdateProcessorFactory.java       |   9 -
 .../processor/UpdateRequestProcessorChain.java  |   1 -
 .../org/apache/solr/util/CommandOperation.java  |   3 -
 .../org/apache/solr/util/PivotListEntry.java    |   2 -
 .../org/apache/solr/util/SolrPluginUtils.java   |  26 +-
 .../solr/util/xslt/TransformerProvider.java     |   1 -
 .../solr/DistributedIntervalFacetingTest.java   |   1 -
 .../test/org/apache/solr/SolrInfoMBeanTest.java |   1 -
 .../solr/TestSimpleTrackingShardHandler.java    |   1 -
 .../PathHierarchyTokenizerFactoryTest.java      |   3 -
 .../apache/solr/cloud/AliasIntegrationTest.java |   2 -
 .../solr/cloud/BaseCdcrDistributedZkTest.java   |   2 -
 .../org/apache/solr/cloud/ClusterStateTest.java |   1 -
 ...ConcurrentDeleteAndCreateCollectionTest.java |   1 -
 .../solr/cloud/ConnectionManagerTest.java       |   5 -
 .../solr/cloud/DeleteInactiveReplicaTest.java   |   1 -
 .../DeleteLastCustomShardedReplicaTest.java     |   1 -
 .../solr/cloud/DistribCursorPagingTest.java     |   3 -
 .../apache/solr/cloud/DistributedQueueTest.java |   1 -
 .../apache/solr/cloud/HttpPartitionTest.java    |   1 -
 .../apache/solr/cloud/MultiThreadedOCPTest.java |   1 -
 ...verseerCollectionConfigSetProcessorTest.java |   1 -
 .../solr/cloud/OverseerTaskQueueTest.java       |   3 -
 .../org/apache/solr/cloud/OverseerTest.java     |   1 -
 .../solr/cloud/RecoveryAfterSoftCommitTest.java |   1 -
 .../solr/cloud/ReplicationFactorTest.java       |   1 -
 .../org/apache/solr/cloud/SSLMigrationTest.java |   1 -
 .../cloud/SimpleCollectionCreateDeleteTest.java |   2 -
 .../apache/solr/cloud/SolrCloudExampleTest.java |   2 -
 .../org/apache/solr/cloud/SyncSliceTest.java    |   2 -
 .../solr/cloud/TestCloudDeleteByQuery.java      |   7 -
 .../apache/solr/cloud/TestCloudInspectUtil.java |   2 -
 .../apache/solr/cloud/TestCollectionAPI.java    |   1 -
 .../apache/solr/cloud/TestConfigSetsAPI.java    |   1 -
 .../cloud/TestConfigSetsAPIExclusivity.java     |   1 -
 .../solr/cloud/TestConfigSetsAPIZkFailure.java  |   1 -
 .../org/apache/solr/cloud/TestCryptoKeys.java   |   1 -
 .../org/apache/solr/cloud/TestLockTree.java     |   7 -
 .../solr/cloud/TestMiniSolrCloudClusterSSL.java |   1 -
 .../apache/solr/cloud/TestSSLRandomization.java |   2 -
 .../TestStressCloudBlindAtomicUpdates.java      |   6 -
 .../solr/cloud/hdfs/HdfsThreadLeakTest.java     |   2 -
 .../HdfsWriteToMultipleCollectionsTest.java     |  19 +
 .../solr/core/BlobRepositoryCloudTest.java      |   6 -
 .../solr/core/BlobRepositoryMockingTest.java    |   2 -
 .../solr/core/HdfsDirectoryFactoryTest.java     |   5 -
 .../org/apache/solr/core/MockInfoMBean.java     |   1 -
 .../apache/solr/core/TestDynamicLoading.java    |   1 -
 .../apache/solr/core/TestInfoStreamLogging.java |   1 -
 .../apache/solr/core/TestJmxMonitoredMap.java   |   3 -
 .../FieldAnalysisRequestHandlerTest.java        |   4 -
 .../org/apache/solr/handler/JsonLoaderTest.java |   4 -
 .../handler/StandardRequestHandlerTest.java     |   8 -
 .../apache/solr/handler/TestBlobHandler.java    |   1 -
 .../org/apache/solr/handler/TestCSVLoader.java  |   1 -
 .../apache/solr/handler/TestConfigReload.java   |   1 -
 .../apache/solr/handler/TestReqParamsAPI.java   |   1 -
 .../handler/TestSolrConfigHandlerCloud.java     |   1 -
 .../TestSolrConfigHandlerConcurrent.java        |   2 -
 .../handler/ThrowErrorOnInitRequestHandler.java |   1 -
 .../admin/CoreMergeIndexesAdminHandlerTest.java |   3 -
 .../component/DistributedMLTComponentTest.java  |   1 -
 .../handler/component/TestExpandComponent.java  |   1 -
 .../handler/component/TestPivotHelperCode.java  |   3 -
 .../highlight/HighlighterMaxOffsetTest.java     |   1 -
 .../solr/internal/csv/CSVPrinterTest.java       |   3 -
 .../solr/internal/csv/CSVStrategyTest.java      |   2 -
 .../csv/ExtendedBufferedReaderTest.java         |   2 -
 .../org/apache/solr/request/JSONWriterTest.java |   4 -
 .../solr/request/TestBinaryResponseWriter.java  |   1 -
 .../org/apache/solr/request/TestFaceting.java   |   1 -
 .../solr/request/TestIntervalFaceting.java      |   1 -
 .../TestPHPSerializedResponseWriter.java        |   1 -
 .../solr/response/TestRawResponseWriter.java    |   4 -
 .../schema/CurrencyFieldOpenExchangeTest.java   |  10 -
 .../solr/schema/CurrencyFieldXmlFileTest.java   |   9 -
 .../org/apache/solr/schema/EnumFieldTest.java   |   1 -
 .../org/apache/solr/schema/PolyFieldTest.java   |   1 -
 .../solr/schema/TestBulkSchemaConcurrent.java   |   1 -
 .../TestCloudManagedSchemaConcurrent.java       |   1 -
 .../apache/solr/schema/TestCloudSchemaless.java |   2 -
 .../apache/solr/schema/TestCollationField.java  |   1 -
 .../apache/solr/search/AnalyticsQueryTest.java  |   1 -
 .../solr/search/DelayingSearchComponent.java    |   1 -
 .../apache/solr/search/FooQParserPlugin.java    |   1 -
 .../apache/solr/search/QueryParsingTest.java    |   8 -
 .../org/apache/solr/search/RankQueryTest.java   |   1 -
 .../apache/solr/search/SortSpecParsingTest.java |   1 -
 .../solr/search/TestCollapseQParserPlugin.java  |   1 -
 .../search/TestGraphTermsQParserPlugin.java     |  12 -
 .../solr/search/TestHashQParserPlugin.java      |   5 -
 .../org/apache/solr/search/TestLRUCache.java    |   5 -
 .../apache/solr/search/TestMissingGroups.java   |   2 -
 .../org/apache/solr/search/TestQueryUtils.java  |   2 -
 .../search/TestRandomCollapseQParserPlugin.java |   3 -
 .../solr/search/TestReRankQParserPlugin.java    |   1 -
 .../org/apache/solr/search/TestRealTimeGet.java |   1 -
 .../apache/solr/search/TestRecoveryHdfs.java    |   1 -
 .../test/org/apache/solr/search/TestReload.java |   2 -
 .../org/apache/solr/search/TestSearchPerf.java  |   1 -
 .../solr/search/TestSimpleQParserPlugin.java    |   3 -
 .../apache/solr/search/TestSolrQueryParser.java |   1 -
 .../test/org/apache/solr/search/TestSort.java   |   1 -
 .../solr/search/facet/TestJsonFacets.java       |   3 -
 .../solr/search/function/TestFunctionQuery.java |   1 -
 .../function/TestMinMaxOnMultiValuedField.java  |   4 -
 .../function/TestSortByMinMaxFunction.java      |   2 -
 .../apache/solr/search/join/BJQParserTest.java  |   1 -
 .../solr/search/mlt/SimpleMLTQParserTest.java   |   4 -
 .../TestClassicSimilarityFactory.java           |   1 -
 .../TestNonDefinedSimilarityFactory.java        |   1 -
 ...stPerFieldSimilarityWithDefaultOverride.java |   2 -
 .../TestSweetSpotSimilarityFactory.java         |   1 -
 .../solr/search/stats/TestDistribIDF.java       |   1 -
 .../security/TestPKIAuthenticationPlugin.java   |   6 -
 .../apache/solr/servlet/ResponseHeaderTest.java |   4 -
 .../spelling/FileBasedSpellCheckerTest.java     |   1 -
 .../solr/spelling/SimpleQueryConverter.java     |   2 -
 .../spelling/TestSuggestSpellingConverter.java  |   1 -
 .../suggest/TestFreeTextSuggestions.java        |   1 -
 .../apache/solr/uninverting/TestFieldCache.java |  10 -
 .../apache/solr/update/AddBlockUpdateTest.java  |   2 -
 .../update/DirectUpdateHandlerOptimizeTest.java |   1 -
 .../solr/update/TestExceedMaxTermLength.java    |   1 -
 .../org/apache/solr/update/VersionInfoTest.java |   2 -
 .../processor/CustomUpdateRequestProcessor.java |   4 -
 .../DefaultValueUpdateProcessorTest.java        |   5 -
 ...DocExpirationUpdateProcessorFactoryTest.java |   1 -
 ...ommitOptimizeUpdateProcessorFactoryTest.java |   5 -
 .../RecordingUpdateProcessorFactory.java        |   3 -
 ...atelessScriptUpdateProcessorFactoryTest.java |   5 -
 .../processor/TestNamedUpdateProcessors.java    |   1 -
 .../TestPartialUpdateDeduplication.java         |   3 -
 .../processor/TolerantUpdateProcessorTest.java  |   2 -
 .../UniqFieldsUpdateProcessorFactoryTest.java   |   1 -
 .../processor/UpdateProcessorTestBase.java      |   1 -
 .../apache/solr/util/SolrPluginUtilsTest.java   |  28 ++
 .../org/apache/solr/util/TestFastWriter.java    |   3 -
 .../solrj/impl/InputStreamResponseParser.java   |   4 -
 .../solrj/impl/Krb5HttpClientBuilder.java       |   7 -
 .../solr/client/solrj/io/comp/HashKey.java      |   2 -
 .../solrj/io/comp/MultipleFieldComparator.java  |   1 -
 .../client/solrj/io/stream/BiJoinStream.java    |   8 -
 .../solrj/io/stream/LeftOuterJoinStream.java    |   4 -
 .../client/solrj/io/stream/StreamContext.java   |   2 -
 .../solrj/io/stream/expr/StreamExplanation.java |   2 -
 .../solr/client/solrj/response/FacetField.java  |   1 -
 .../solr/client/solrj/response/PivotField.java  |   2 -
 .../solr/common/cloud/ClusterStateUtil.java     |   2 -
 .../apache/solr/common/cloud/SolrZkClient.java  |   1 -
 .../solr/common/cloud/ZkConfigManager.java      |   1 -
 .../apache/solr/client/solrj/GetByIdTest.java   |   2 -
 .../solrj/MergeIndexesExampleTestBase.java      |   1 -
 .../client/solrj/SolrSchemalessExampleTest.java |   1 -
 .../solrj/beans/TestDocumentObjectBinder.java   |   2 -
 .../embedded/LargeVolumeBinaryJettyTest.java    |   1 -
 .../solrj/embedded/LargeVolumeEmbeddedTest.java |   1 -
 .../solrj/embedded/LargeVolumeJettyTest.java    |   1 -
 .../solrj/embedded/SolrExampleEmbeddedTest.java |   1 -
 .../solr/client/solrj/io/graph/GraphTest.java   |   2 -
 .../client/solrj/io/sql/JdbcDriverTest.java     |   1 -
 .../solrj/io/stream/RecordCountStream.java      |   1 -
 .../StreamExpressionToExplanationTest.java      |   1 -
 .../io/stream/ops/ConcatOperationTest.java      |   1 -
 .../solrj/request/TestUpdateRequestCodec.java   |   2 -
 .../solr/common/cloud/TestZkConfigManager.java  |   1 -
 .../solr/common/util/TestJsonRecordReader.java  |   1 -
 .../solr/analysis/MockTokenizerFactory.java     |   1 -
 .../java/org/apache/solr/cloud/ChaosMonkey.java |   1 -
 .../org/apache/solr/cloud/MockSolrZkClient.java |   1 -
 .../org/apache/solr/util/BaseTestHarness.java   |   1 -
 .../org/apache/solr/util/ExternalPaths.java     |   4 -
 .../org/apache/solr/util/RandomMergePolicy.java |   8 -
 .../org/apache/solr/util/SSLTestConfig.java     |   4 -
 670 files changed, 1394 insertions(+), 1902 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ccf2070e/solr/CHANGES.txt
----------------------------------------------------------------------
diff --cc solr/CHANGES.txt
index bd7f19c,e2a7112..5601791
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@@ -57,11 -62,8 +62,10 @@@ Detailed Change Lis
  New Features
  ----------------------
  
 -* SOLR-9187: Support dates and booleans in /export handler, support boolean DocValues fields
 +* SOLR-9187: Support dates and booleans in /export handler, support boolean DocValues fields (Erick Erickson)
 +
 +* SOLR-8048: bin/solr script should support basic auth credentials provided in solr.in.sh (noble)
  
- 
  Bug Fixes
  ----------------------