Commit Graph

25122 Commits

Author SHA1 Message Date
Karl Wright 817cbf0c69 Merge branch 'branch_6x' of https://git-wip-us.apache.org/repos/asf/lucene-solr into branch_6x 2016-05-20 13:51:06 -04:00
Karl Wright abfc24bfa7 LUCENE-7290: Add support for calculating bounds for intersections. 2016-05-20 13:51:00 -04:00
Jan Høydahl 4aa9c32dac SOLR-9131: Fix "start solr" text in cluster.vm Velocity template
(cherry picked from commit 3d750b6)
2016-05-20 12:45:49 +02:00
Alan Woodward f1e870c016 SOLR-9132: Move some tests to SolrCloudTestBase 2016-05-19 16:59:08 +01:00
Alan Woodward 8db3c73375 SOLR-9113: Fix re-registration race 2016-05-19 14:53:43 +01:00
Karl Wright 7c3095eef0 LUCENE-7290: Roll back resolution increase. 2016-05-19 05:10:07 -04:00
Alan Woodward 35024d3edc LUCENE-7231: WeightedSpanTermExtractor correctly deals with single-term PhraseQuery 2016-05-19 09:50:14 +01:00
Alan Woodward 53d96705e9 LUCENE-7284: GapSpans needs to implement positionsCost() 2016-05-19 09:50:07 +01:00
jbernste 73b71b16d2 SOLR-9128: Update CHANGES.txt
Conflicts:
	solr/CHANGES.txt
2016-05-18 22:54:21 -04:00
jbernste cb38b14205 SOLR-9128: Fix error handling issues in Streaming classes 2016-05-18 22:53:02 -04:00
Karl Wright f4f1d8adc5 LUCENE-7290: Decrease MINIMUM_RESOLUTION, since it's too big for at least one test case. 2016-05-18 20:36:06 -04:00
Uwe Schindler 76d4dea086 Hide bootclasspath warning also in Solr (Java 9) 2016-05-18 23:52:33 +02:00
Shalin Shekhar Mangar 894650d352 SOLR-9117: Write contributor's full name in change log
(cherry picked from commit 4bc3477)
2016-05-18 20:20:35 +05:30
Shalin Shekhar Mangar 2dff2b8070 SOLR-9116: Race condition causing occasional SolrIndexSearcher leak when SolrCore is reloaded
(cherry picked from commit d6a5c5a)
2016-05-18 20:17:35 +05:30
Karl Wright aa339a2f07 LUCENE-7212: Add outside distance classes and methods. 2016-05-18 09:04:37 -04:00
Karl Wright a13428e008 LUCENE-7212: Rename the public method for path sort fields. 2016-05-18 08:35:39 -04:00
Karl Wright ace032ea26 LUCENE-7212: Add tests for encoding/decoding. 2016-05-18 07:59:50 -04:00
Karl Wright ace1f7e3bd LUCENE-7288: Return POSITIVE_INFINITY for points outside of shape, not MAX_VALUE. 2016-05-18 07:08:16 -04:00
David Smiley bd3e568754 LUCENE-7278: DRPT: fix test bug (when milli is 0)
(cherry picked from commit 2accf12)
2016-05-17 23:27:09 -04:00
Karl Wright 8a407f0399 LUCENE-7212: Add Geo3D sorted document fields. 2016-05-17 17:21:43 -04:00
Shalin Shekhar Mangar ba7698e4e7 SOLR-9117: The first SolrCore is leaked after reload
(cherry picked from commit d1202a8)
2016-05-18 02:04:15 +05:30
jbernste b1b9015290 SOLR-9118: Update CHANGES.txt
Conflicts:
	solr/CHANGES.txt
2016-05-17 14:21:11 -04:00
jbernste 93201cd07e SOLR-9118: HashQParserPlugin should trim partition keys 2016-05-17 14:17:17 -04:00
Steve Rowe 01ed4a5f7d SOLR-9121: Fix check-lib-versions task to pass through the "ivysettings.xml" property as an Ivy variable so that the nested ivy settings file can be located when parsing the top-level ivy settings file. 2016-05-17 10:08:41 -04:00
Alan Woodward 8de89081e6 SOLR-9113: Improve state watcher API 2016-05-17 10:45:34 +01:00
Steve Rowe 29e7d64da1 SOLR-8970: IntelliJ config: add src/resources/ as a java-resource dir to the solr-test-framework module, so that resources there get copied into the compilation output dir. 2016-05-16 20:56:15 -04:00
Steve Rowe f73997bb41 SOLR-9109: add missing comma in smokeTestRelease.py extras list 2016-05-16 19:31:40 -04:00
Steve Rowe 2dbc164072 SOLR-9109: tell the smoke tester and the check-lib-versions target about the renamed Ivy settings files 2016-05-16 18:51:36 -04:00
Uwe Schindler 8df8243f53 SOLR-9109: the ${settings.xml} is a file path, not a URL 2016-05-17 00:29:04 +02:00
Steve Rowe 0ec57a9918 SOLR-9109: Allow specification of a custom Ivy settings file via system property "ivysettings.xml". 2016-05-16 18:07:31 -04:00
Uwe Schindler 72ad66601d Move non-inner classes to separate files: This breaks IDEs and update checks by javac 2016-05-16 19:55:02 +02:00
Uwe Schindler d01bc2c78f SOLR-9115: Get rid of javax.xml.bind.DatatypeConverter in Solr's SimplePostTool 2016-05-16 18:02:40 +02:00
Karl Wright 0e9ec477d7 LUCENE-7212: Add geo3d doc values field 2016-05-16 06:53:59 -04:00
Alan Woodward b5c369a773 SOLR-8323: Handle removal of legacy collections 2016-05-14 19:10:03 +01:00
Alan Woodward 06ebd4fd7e SOLR-8323: DocCollection.isFullyActive needs to know how many replicas to expect 2016-05-14 13:01:05 +01:00
Alan Woodward dd23fa4015 SOLR-9106: Cache cluster properties on ZkStateReader 2016-05-14 10:14:45 +01:00
Mike McCandless ec4bcf1c70 put strange placeholder back so javadocs pass 2016-05-14 04:20:21 -04:00
Steve Rowe 22087dfd0c Manually move the javadoc paragraph 'Use this to get the latest & greatest settings...' from the 6.0.0 version to the 6.1.0 version. 2016-05-13 18:48:51 -04:00
Steve Rowe c9f7535707 Add version 6.0.1 2016-05-13 18:41:19 -04:00
Steve Rowe 82bad7883d LUCENE-7265: Pull change id related code out of addVersion.py; rename 'major' BranchType to 'unstable'
Conflicts:
	dev-tools/scripts/addVersion.py
2016-05-13 18:38:48 -04:00
Steve Rowe e9e8e3ead9 addVersion.py (via scriptutil.py): fix name of the running script in error message 2016-05-13 17:23:37 -04:00
Steve Rowe 6e52d62f69 Improve addVersion.py: in Version.java, remove 'Use this to get the latest...' from the previous LATEST, and add it to the new LATEST 2016-05-13 17:23:12 -04:00
Alan Woodward 06d2f6368d SOLR-8323: Add CollectionStateWatcher API 2016-05-13 21:43:43 +01:00
Mikhail Khludnev e94ffde44e SOLR-8208: fixing TestSubQueryTransformerDistrib by passing reasonable numbers in creatCollection() 2016-05-13 23:35:58 +03:00
Steve Rowe da31173bf2 Revert "LUCENE-7265: Fix addVersion to cherry-pick downstream changes by using the change id"
This reverts commit 3ad0201e3e.
2016-05-13 16:35:15 -04:00
David Smiley 9d826ffa2f SOLR-9080 SOLR-9085: Fix date math before the year 1582.
note: DateMathParser no longer needs a Locale
(cherry picked from commit 4193e60)
2016-05-13 10:05:37 -04:00
Alan Woodward 18f54d6f77 SOLR-9072: Move morphline-core zk tests to SolrCloudTestCase 2016-05-13 14:40:17 +01:00
David Smiley 32e16cb0e6 LUCENE-7278: DRPT: fix bug in assert statement
(cherry picked from commit 1d35bd0)
2016-05-12 23:05:28 -04:00
Robert Muir b77c16eeae remove unnecessary Placeholder and mark old codec deprecated 2016-05-12 21:14:52 -04:00
David Smiley 1f6487a7cc LUCENE-7278: DateRangePrefixTree's Calendar is now configurable
(cherry picked from commit 0628696)
2016-05-12 14:16:08 -04:00