You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by kw...@apache.org on 2016/06/07 11:11:18 UTC
[2/2] lucene-solr:master: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/lucene-solr
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/lucene-solr
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/d74db527
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/d74db527
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/d74db527
Branch: refs/heads/master
Commit: d74db527bfc0150fa1ee5af267a07496aa394ee0
Parents: e9e7d0a 5c672e1
Author: Karl Wright <Da...@gmail.com>
Authored: Tue Jun 7 07:11:01 2016 -0400
Committer: Karl Wright <Da...@gmail.com>
Committed: Tue Jun 7 07:11:01 2016 -0400
----------------------------------------------------------------------
lucene/CHANGES.txt | 9 +
.../apache/lucene/index/BufferedUpdates.java | 7 +-
.../apache/lucene/index/DocumentsWriter.java | 75 ++-
.../index/DocumentsWriterDeleteQueue.java | 126 ++--
.../index/DocumentsWriterFlushControl.java | 24 +-
.../lucene/index/DocumentsWriterPerThread.java | 44 +-
.../index/DocumentsWriterPerThreadPool.java | 16 +-
.../org/apache/lucene/index/IndexWriter.java | 253 ++++++--
.../lucene/index/StandardDirectoryReader.java | 2 +-
.../lucene/index/TrackingIndexWriter.java | 168 -----
.../org/apache/lucene/index/TwoPhaseCommit.java | 5 +-
.../org/apache/lucene/search/BooleanScorer.java | 6 +-
.../search/ControlledRealTimeReopenThread.java | 18 +-
.../lucene/search/FilterLeafCollector.java | 7 +-
.../org/apache/lucene/store/IndexInput.java | 5 +
.../index/TestDocumentsWriterDeleteQueue.java | 6 +-
.../lucene/index/TestIndexWriterConfig.java | 1 -
.../lucene/index/TestIndexWriterDelete.java | 4 +-
.../index/TestIndexingSequenceNumbers.java | 640 +++++++++++++++++++
.../apache/lucene/index/TestRollingUpdates.java | 2 +-
.../org/apache/lucene/index/TestTryDelete.java | 17 +-
.../lucene/index/TestTwoPhaseCommitTool.java | 14 +-
.../org/apache/lucene/search/TestBoolean2.java | 130 +++-
.../TestControlledRealTimeReopenThread.java | 25 +-
.../lucene/search/TestSimpleExplanations.java | 27 +-
.../TestSimpleExplanationsWithFillerDocs.java | 126 ++++
.../directory/DirectoryTaxonomyWriter.java | 8 +-
.../apache/lucene/index/RandomIndexWriter.java | 64 +-
.../lucene/search/BaseExplanationTestCase.java | 43 +-
.../search/TestBaseExplanationTestCase.java | 120 ++++
solr/CHANGES.txt | 11 +-
solr/bin/solr.cmd | 1 -
.../clustering/src/test-files/log4j.properties | 2 +-
.../solr/handler/dataimport/JdbcDataSource.java | 123 ++--
.../src/test-files/log4j.properties | 2 +-
.../handler/dataimport/TestDocBuilder2.java | 2 +-
.../dataimport/TestFileListEntityProcessor.java | 21 +-
.../handler/dataimport/TestJdbcDataSource.java | 217 ++++++-
.../org/apache/solr/cloud/ZkController.java | 124 ++--
.../org/apache/solr/core/CoreContainer.java | 41 +-
.../test/org/apache/solr/cloud/ZkCLITest.java | 3 +-
solr/example/resources/log4j.properties | 2 +-
solr/server/resources/log4j.properties | 2 +-
.../scripts/cloud-scripts/log4j.properties | 2 +-
.../solrj/request/CollectionAdminRequest.java | 2 +-
.../apache/solr/common/cloud/DocCollection.java | 23 -
.../cloud/TestCollectionStateWatchers.java | 5 +-
.../java/org/apache/solr/SolrTestCaseJ4.java | 2 +-
48 files changed, 1945 insertions(+), 632 deletions(-)
----------------------------------------------------------------------