GitHub user totoaumikelabo opened a pull request: https://github.com/apache/lucene-solr/pull/247
Branch 5 5 Playing around with lucene-5.5.0, Thank so much. You can merge this pull request into a Git repository by running: $ git pull https://github.com/apache/lucene-solr branch_5_5 Alternatively you can review and apply these changes as the patch at: https://github.com/apache/lucene-solr/pull/247.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 #247 ---- commit 9a4ff707ed8d4aafa20dd3cc9c0fd4c7378046f2 Author: Mike McCandless <mikemcc...@apache.org> Date: 2016-02-11T15:07:05Z LUCENE-6938: add TODO that we should also detect unpushed commits commit 850c6c248373d80617e771f776041fd0d59ac31a Author: Mike McCandless <mikemcc...@apache.org> Date: 2016-02-11T15:08:29Z fix usage line commit 13313415a5d975f77a5360239d82a344b9a7aa20 Author: Varun Thacker <varunthacker1...@gmail.com> Date: 2016-02-11T00:28:13Z SOLR-8534: Fix SolrJ APIs to add async support commit 0cd6d229b3c7d73e7d83eb687c2862fa8eeeb703 Author: Mike McCandless <mikemcc...@apache.org> 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 <cpoersc...@apache.org> 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 <cpoersc...@apache.org> Date: 2016-02-11T17:29:34Z SOLR-8621: add (test-framework) RandomForceMergePolicyFactory for existing (test-framework) RandomForceMergePolicy commit 4c7c1d3c58d2398de4cc651025a32125afe7adbc Author: Christine Poerschke <cpoersc...@apache.org> 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 <cpoersc...@apache.org> 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 <sar...@apache.org> 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 <uschind...@apache.org> 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 <uschind...@apache.org> Date: 2016-02-13T17:38:16Z LUCENE-7027: Fix accidental deprecation of test commit 528fb8702b91aaeb7a0491a638ed10ae8ae57f2c Author: Uwe Schindler <uschind...@apache.org> Date: 2016-02-13T23:57:27Z LUCENE-7028: Deprecate a duplicate method in NumericUtils commit 1d6014b5c6b56fa8aab4142074e5befc2ce7f249 Author: Mike McCandless <mikemcc...@apache.org> 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 <mikemcc...@apache.org> Date: 2016-02-15T10:17:40Z fix this test to avoid MockRandomMergePolicy which leads to false failures commit bc7173944fb83fdbb6372800241273226a36faa3 Author: Uwe Schindler <uschind...@apache.org> 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 <uschind...@apache.org> Date: 2016-02-15T20:44:57Z LUCENE-6989: Disable MMapDirectory unmap-hack for Java 9 commit 70844e395691278482052bc19644759d35fa6a61 Author: Mike McCandless <mikemcc...@apache.org> Date: 2016-02-15T23:42:24Z use try-w-resources so Directory is closed even on assumption violation commit 8164272e07454ea8ff7a0db348639b6a777311f1 Author: Uwe Schindler <uschind...@apache.org> Date: 2016-02-16T07:49:30Z LUCENE-6989: fix javadocs bug (Java 8) commit 2a228b3920a07f930f7afb6a42d0d20e184a943c Author: Uwe Schindler <uschind...@apache.org> Date: 2016-02-16T16:11:00Z LUCENE-6989: Improve MMapDirectory's unmapping checks to catch more non-working cases commit 3f01556db3b9abfc10727685ae5c2524b6c55ad1 Author: Mike McCandless <mikemcc...@apache.org> Date: 2016-02-16T21:22:50Z disable this test on Windows commit c450544fe953c3fe8b5115f8578d3a16c8a587de Author: Mike McCandless <mikemcc...@apache.org> Date: 2016-02-18T14:27:21Z yet more verbosity for this test that only fails rarely on OS X commit 82d73e4d9c046ed56ec850b2208bb3deb7c97bf6 Author: Mike McCandless <mikemcc...@apache.org> Date: 2016-02-18T15:11:03Z fix static member leak commit 73694c157b8266ef5c05191e91b104d96537bbdf Author: Mike McCandless <mikemcc...@apache.org> Date: 2016-02-22T10:07:12Z more test verbosity for exotic OS X only test failure commit 133b6cdb838bb1261652e469936f7aeab133e9f0 Author: Jan Høydahl <jan...@apache.org> Date: 2016-02-26T00:26:30Z SOLR-8737: Managed synonym lists do not include the original term in the expand commit 247f96868eed6fd9b8be1b413b236909d09e9636 Author: Mike McCandless <mikemcc...@apache.org> Date: 2016-02-26T09:27:28Z fix a few plases in CheckIndex to not try to call BytesRefBuilder.toString (it hits an UnsupportedOperationException) commit 55b3614fd37eeb1cf6ac2d2ef6c902d18e42d135 Author: Christine Poerschke <cpoersc...@apache.org> Date: 2016-02-26T15:15:28Z SOLR-8734: fix (maxMergeDocs|mergeFactor) deprecation warnings: in solrconfig.xml <maxMergeDocs|mergeFactor> may not be combined with <mergePolicyFactory> and <maxMergeDocs|mergeFactor> on their own or combined with <mergePolicy> is a warning. (Resolved conflict for solr/CHANGES.txt file.) commit c7214a2ba5f96492e5c4cd6a558734217afe5089 Author: Christine Poerschke <cpoersc...@apache.org> Date: 2016-02-26T17:44:53Z Merge 5.5.1 changes sections from SOLR-8737 and SOLR-8734 tickets. commit 4e1c381b32b7b7630db5f1e24a3a8ab62605ced1 Author: Alan Woodward <romseyg...@apache.org> Date: 2016-02-27T10:03:01Z SOLR-8712: Variable solr.core.instanceDir was not being resolved commit a1562c52671336f11f434bfb536260e260d01500 Author: Shai Erera <sh...@apache.org> Date: 2016-03-08T20:11:18Z SOLR-8793: Fix stale commit files' size computation in LukeRequestHandler commit c17f80a7a22a4215ebcfe08939b6c0acc30df7c2 Author: Noble Paul <no...@apache.org> Date: 2016-03-04T10:52:37Z SOLR-8728 ---- --- --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@lucene.apache.org For additional commands, e-mail: dev-h...@lucene.apache.org