GitHub user shabino opened a pull request:
https://github.com/apache/lucene-solr/pull/181
Mt cft 5.5.4
A preview so DerekR can look at my travis config
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/MarketTrack/lucene-solr mt-cft-5.5.4
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/lucene-solr/pull/181.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #181
----
commit 7a329d4e299f364a716ca7e3d786684f280d0100
Author: Mike McCandless <[email protected]>
Date: 2016-02-10T22:55:07Z
LUCENE-6938: switch from svn to git
commit 47055d569dbefb41f88631ad917ab76b550ad8d4
Author: Christine Poerschke <[email protected]>
Date: 2016-02-10T21:22:17Z
SOLR-8621: fix mergePolicyFacory vs. mergePolicyFactory typos in comments
in solr/contrib and solr/example solrconfig.xml files.
commit 3f06f9a76f97203445ff9b35306ec0dcda59e0d8
Author: Christine Poerschke <[email protected]>
Date: 2016-02-10T22:19:06Z
SOLR-8621: WrapperMergePolicyFactory logic tweaks
* fix so that getMergePolicy() can now be called more than once
* added WrapperMergePolicyFactoryTest.testUpgradeIndexMergePolicyFactory()
* account for overlap between wrapping and wrapped setters (and disallow
it)
** illustration:
<mergePolicyFactory class="UpgradeMergePolicyFactory">
<int name="noCFSRatio">0.24</int>
<str name="wrapped.prefix">mergePolicy</str>
<str
name="mergePolicy.class">TieredMergePolicyFactory</str>
<int name="mergePolicy.noCFSRatio">0.42</int>
</mergePolicyFactory>
** implementation details: the wrapping MP's setter calls the wrapped MP's
setter and in the current code the wrapping MP's value prevails i.e. the 0.24
value in the illustration since the wrapped MP is constructed before the
wrapping MP. an end-user however might reasonably assume that the wrapped MP's
0.42 value will prevail. at best configuring the same setter twice within the
same overall <mergePolicyFactory> element is ambiguous and so the code now
disallows it.
commit 51257d2ebe099a6c7029e7fd47ce25f4393cfb49
Author: markrmiller <[email protected]>
Date: 2016-02-11T13:39:00Z
SOLR-8575: Revert while investigated. (reverted from commit
482b40f841660820f633267a21e6df44aff55346)
commit 02dee401cc14191a8b95bb644794a7d40c0163a4
Author: Steve Rowe <[email protected]>
Date: 2016-02-11T14:21:18Z
LUCENE-6997: Maven config: build a spatial module test-jar, and add a test
dependency on it to the sandbox module
commit 329167872371d19f37f9f48f1822014dc87a7eb6
Author: Mike McCandless <[email protected]>
Date: 2016-02-11T14:52:48Z
LUCENE-6938: switch from svn to git
commit e3a06f0334034c1280f416b4afd6a6249cda395e
Author: Mike McCandless <[email protected]>
Date: 2016-02-11T14:59:13Z
LUCENE-6938: fix buggy detection of dirty git checkout
commit 9a4ff707ed8d4aafa20dd3cc9c0fd4c7378046f2
Author: Mike McCandless <[email protected]>
Date: 2016-02-11T15:07:05Z
LUCENE-6938: add TODO that we should also detect unpushed commits
commit 850c6c248373d80617e771f776041fd0d59ac31a
Author: Mike McCandless <[email protected]>
Date: 2016-02-11T15:08:29Z
fix usage line
commit 13313415a5d975f77a5360239d82a344b9a7aa20
Author: Varun Thacker <[email protected]>
Date: 2016-02-11T00:28:13Z
SOLR-8534: Fix SolrJ APIs to add async support
commit 0cd6d229b3c7d73e7d83eb687c2862fa8eeeb703
Author: Mike McCandless <[email protected]>
Date: 2016-02-11T20:19:43Z
LUCENE-6938: fix some places in smoke tester to accept git commit hash
instead of svn revison
commit 6a9d89309595ff668f851c17af4f3f97af7640c1
Author: Christine Poerschke <[email protected]>
Date: 2016-02-11T17:05:17Z
SOLR-8621: factor out protected abstract
WrapperMergePolicyFactory.getMergePolicyInstance method
Here in SOLR-8621:
* UpgradeIndexMergePolicyFactory extends WrapperMergePolicyFactory
* (WrapperMergePolicyFactoryTest's) DefaultingWrapperMergePolicyFactory
extends WrapperMergePolicyFactory
Elsewhere in SOLR-5730:
* SortingMergePolicyFactory will extend WrapperMergePolicyFactory
commit d49d9dac835ecabd0c5202507cb98d2fdd6d95c5
Author: Christine Poerschke <[email protected]>
Date: 2016-02-11T17:29:34Z
SOLR-8621: add (test-framework) RandomForceMergePolicyFactory for existing
(test-framework) RandomForceMergePolicy
commit 4c7c1d3c58d2398de4cc651025a32125afe7adbc
Author: Christine Poerschke <[email protected]>
Date: 2016-02-11T20:41:35Z
SOLR-8621: solrconfig.xml in solr/server/solr/configsets and
test-files/solr/configsets/bad-mergepolicy now also use <mergePolicyFactory>
instead of <mergePolicy>
commit 8c60352182f721f897b88f6111ff5c28cd66bc65
Author: Christine Poerschke <[email protected]>
Date: 2016-02-12T19:04:45Z
SOLR-8621: SolrIndexConfig.toMap() fix to distinguish mergePolicyInfo and
mergePolicyFactoryInfo, associated SolrIndexConfigTest and TestConfig tweaks.
commit f6a1bbf8bec8b83ce68b697b9905048b44ef80f6
Author: Steve Rowe <[email protected]>
Date: 2016-02-12T21:39:35Z
LUCENE-7204, LUCENE-6938: fix smoke tester to pull pom.xml.template files
from the Solr source distribution instead of from svn
commit d83f57901f38334c103678b985cf875a9ef51013
Author: Uwe Schindler <[email protected]>
Date: 2016-02-13T17:02:57Z
LUCENE-7027: Fixed NumericTermAttribute to not throw
IllegalArgumentException after NumericTokenStream was exhausted
# Conflicts:
# lucene/core/src/java/org/apache/lucene/analysis/NumericTokenStream.java
#
lucene/core/src/test/org/apache/lucene/analysis/TestNumericTokenStream.java
commit 40f15765ba7605d1b5f3897fc3f97f2848635d77
Author: Uwe Schindler <[email protected]>
Date: 2016-02-13T17:38:16Z
LUCENE-7027: Fix accidental deprecation of test
commit 528fb8702b91aaeb7a0491a638ed10ae8ae57f2c
Author: Uwe Schindler <[email protected]>
Date: 2016-02-13T23:57:27Z
LUCENE-7028: Deprecate a duplicate method in NumericUtils
commit 1d6014b5c6b56fa8aab4142074e5befc2ce7f249
Author: Mike McCandless <[email protected]>
Date: 2016-02-14T13:47:36Z
absorb the un-released 5.4.2 changes into 5.5.0's section
commit 989484ae2eafaef05a6eb54f938b790629ae5d8f
Author: Mike McCandless <[email protected]>
Date: 2016-02-15T10:17:40Z
fix this test to avoid MockRandomMergePolicy which leads to false failures
commit bc7173944fb83fdbb6372800241273226a36faa3
Author: Uwe Schindler <[email protected]>
Date: 2016-02-14T23:16:40Z
LUCENE-6989: Disable test if mmap unmapping is not working (otherwise will
fail with later Java 9), until we committed real fix for LUCENE-6989; remove
useless and broken test
commit 7a28c454f244ab0cf7af0fa0d0d4b94216171701
Author: Uwe Schindler <[email protected]>
Date: 2016-02-15T20:44:57Z
LUCENE-6989: Disable MMapDirectory unmap-hack for Java 9
commit 70844e395691278482052bc19644759d35fa6a61
Author: Mike McCandless <[email protected]>
Date: 2016-02-15T23:42:24Z
use try-w-resources so Directory is closed even on assumption violation
commit 8164272e07454ea8ff7a0db348639b6a777311f1
Author: Uwe Schindler <[email protected]>
Date: 2016-02-16T07:49:30Z
LUCENE-6989: fix javadocs bug (Java 8)
commit 2a228b3920a07f930f7afb6a42d0d20e184a943c
Author: Uwe Schindler <[email protected]>
Date: 2016-02-16T16:11:00Z
LUCENE-6989: Improve MMapDirectory's unmapping checks to catch more
non-working cases
commit 3f01556db3b9abfc10727685ae5c2524b6c55ad1
Author: Mike McCandless <[email protected]>
Date: 2016-02-16T21:22:50Z
disable this test on Windows
commit c450544fe953c3fe8b5115f8578d3a16c8a587de
Author: Mike McCandless <[email protected]>
Date: 2016-02-18T14:27:21Z
yet more verbosity for this test that only fails rarely on OS X
commit 82d73e4d9c046ed56ec850b2208bb3deb7c97bf6
Author: Mike McCandless <[email protected]>
Date: 2016-02-18T15:11:03Z
fix static member leak
commit 73694c157b8266ef5c05191e91b104d96537bbdf
Author: Mike McCandless <[email protected]>
Date: 2016-02-22T10:07:12Z
more test verbosity for exotic OS X only test failure
----
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
