Commit Graph

8357 Commits

Author SHA1 Message Date
Mikhail Khludnev 871347282a SOLR-8445: fix line separator in log4j.properties files 2016-06-07 00:25:18 +03:00
Chris Hostetter 4e3884bec7 Revert "SOLR-9140: Replace some zk state polling with CollectionStateWatchers"
Alan's comments (via Uwe) in SOLR-9140 jira comments suggest that he thought he had already
reverted this on both branches, but that is not the case.  Reverting on his behalf due to the
likelyhood that this is causing SOLR-9189.

Alan's comments regarding the master equivilent revert...

"There's still some places where notifications can be missed, so I'm reverting
this until those are fixed."

This reverts commit 9f299bb6ad.
2016-06-06 14:13:59 -07:00
Mikhail Khludnev 87d46225cd SOLR-8676: keep LOG4J_CONFIG in solr.cmd 2016-06-06 23:55:01 +03:00
Mikhail Khludnev 6fd494ebef SOLR-8610: Resolve variables in encryptKeyFile of DIH's JdbcDataSource 2016-06-06 23:42:21 +03:00
Mikhail Khludnev 22e5d31cdc SOLR-8612: closing JDBC Statement on exceptions from JdbcDataSource in DataImportHandler aka DIH (Kristine Jetzke via Mikhail Khludnev) 2016-06-06 21:45:20 +03:00
Alan Woodward 3595b9ab2e Revert "SOLR-9181: Fix test bug in ZkStateReaderTest"
This reverts commit 0cfe43164a.
2016-06-04 11:06:31 +01:00
Chris Hostetter 8481d6f47f SOLR-9107: new @RandomizeSSL annotation for more fine grained control of SSL testing
(cherry picked from commit 09372acb66)

Conflicts:
	solr/CHANGES.txt
2016-06-03 11:12:42 -07:00
Alan Woodward 9f299bb6ad SOLR-9140: Replace some zk state polling with CollectionStateWatchers 2016-06-03 15:52:41 +01:00
Alan Woodward 0cfe43164a SOLR-9181: Fix test bug in ZkStateReaderTest 2016-06-03 15:13:17 +01:00
Alan Woodward ec40824bfd SOLR-9107: Make SolrTestCaseJ4.beforeClass() / .afterClass() public 2016-06-03 14:32:58 +01:00
Chris Hostetter 7f82139369 SOLR-9182: SuppressSSL on some tests where it's non to cause OOM
(cherry picked from commit 1eb6c9f816)

Conflicts:
	solr/core/src/test/org/apache/solr/cloud/TestTolerantUpdateProcessorRandomCloud.java
2016-06-02 11:30:28 -07:00
Noble Paul 734dcb99fc SOLR-8744: Overseer operations performed with fine grained mutual exclusion 2016-06-02 14:49:06 +05:30
Noble Paul 91f8edca8f SOLR-7123: '/update/json/docs' path supports nested documents 2016-06-01 18:35:34 +05:30
Chris Hostetter 22faa09882 SOLR-8940: Fix group.sort option
(cherry picked from commit 18256fc287)
2016-05-31 16:12:55 -07:00
Noble Paul 6662cdc07f Merge remote-tracking branch 'origin/branch_6x' into branch_6x 2016-05-31 23:15:07 +05:30
Noble Paul d100dcdc56 fixing typos in javadocs 2016-05-31 23:14:37 +05:30
Jan Høydahl a460addd2f SOLR-8583: Do not attempt highlight of alternate if it is same as original hl field
(cherry picked from commit 05ce40a)
2016-05-30 10:25:55 +02:00
Jan Høydahl fa84052682 SOLR-8583: Apply highlighting to hl.alternateField by default.
(cherry picked from commit e37e49e)
2016-05-29 09:46:15 +02:00
Erick e4210b29a8 SOLR-9136: Separate out the error statistics into server-side error vs client-side error 2016-05-28 11:20:05 -07:00
Mikhail Khludnev 9863eea256 SOLR-9110: removing static members from tests. 2016-05-28 00:52:52 +03:00
yonik 5525f42928 SOLR-9160: Sync 6x and 7.0 move of UninvertingReader, SlowCompositeReaderWrapper for Solr (LUCENE-7283) 2016-05-27 12:40:24 -04:00
Mikhail Khludnev aec3654fb8 SOLR-9110: moving JoinFromCollection- SubQueryTransformer- BlockJoinFacet- Distrib Tests to SolrCloudTestCase 2016-05-27 14:36:45 +03:00
jdyer1 f1f85e560f SOLR-9165: disable "cursorMark" when testing for valid SpellCheck Collations 2016-05-26 14:48:23 -05:00
jdyer1 1609428786 SOLR-9141: Fix ClassCastException when using the /sql handler count() function with single-shard collections 2016-05-26 13:43:14 -05:00
Noble Paul 8276a62b42 SOLR-8995: Replace anonymous implementations of SAM interfaces with Lambdas 2016-05-25 23:43:12 +05:30
Chris Hostetter dc67fcde51 SOLR-9119: several static methods in ValueSourceParser have been made private in master, and deprecated here
(cherry picked from commit e9f65fe0f8) ... with modifications
2016-05-24 15:51:34 -07:00
Chris Hostetter 1f5be04af0 SOLR-9159: New cloud based concurrent atomic update test
(cherry picked from commit 19044afed4)
2016-05-24 13:30:38 -07:00
Jan Høydahl 41c3112693 SOLR-9151: Fix SolrCLI so that bin/solr -e cloud example can be run from any CWD
(cherry picked from commit 50c4f58)
2016-05-24 12:57:49 +02:00
Dawid Weiss d6264eb475 LUCENE-7277: Make Query.hashCode and Query.equals abstract. 2016-05-24 10:36:15 +02:00
Noble Paul afe196481f improved logging for debug errors such as these SOLR-9143 2016-05-24 10:41:13 +05:30
Dennis Gove ab87a0e756 SOLR-8988: Adds query option facet.distrib.mco which when set to true allows the use of facet.mincount=1 in cloud mode 2016-05-23 15:23:37 -04:00
Christine Poerschke c432e44264 SOLR-9134: Fix RestManager.addManagedResource return value. 2016-05-23 16:41:34 +01:00
Alan Woodward 6c37541618 SOLR-9132: Fix request-counting logic in ConnectionReuseTest 2016-05-23 15:25:25 +01:00
Noble Paul 978885cf70 Merge remote-tracking branch 'origin/branch_6x' into branch_6x 2016-05-23 12:17:09 +05:30
Noble Paul 48feaed745 more logging for debug errors such as these SOLR-9143 2016-05-23 12:16:43 +05:30
Mikhail Khludnev 02a31ebc84 SOLR-9147: trying to fix the build 2016-05-23 08:02:18 +03:00
Uwe Schindler ecf2a732fc LUCENE-7296: Update forbiddenapis to version 2.1 2016-05-23 00:18:42 +02:00
Mikhail Khludnev bbac85c35a SOLR-9147: using BAOS from commons io 2.5 in EmbeddedSolrServer to avoid array resize. 2016-05-23 00:15:46 +03:00
Steve Rowe b4d8e42a1f SOLR-8801: /bin/solr create script always returns exit code 0 when a collection/core already exists 2016-05-20 19:37:37 -04:00
Uwe Schindler ebcc991034 Merge branch 'branch_6x' of https://git-wip-us.apache.org/repos/asf/lucene-solr into branch_6x 2016-05-20 22:26:14 +02:00
Uwe Schindler 7bd6d94952 LUCENE-7292: Use '-release' instead of '-source/-target' during compilation on Java 9+ to ensure real cross-compilation 2016-05-20 22:25:28 +02:00
Alan Woodward 0132d58e55 SOLR-9132: Add some logging to ConnectionReuseTest for debugging 2016-05-20 19:20:59 +01: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
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
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