Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
25,778 Commits 29 Branches 469 Tags 768 MiB
Commit Graph

4881 Commits

Author SHA1 Message Date
Noble Paul b4c8f5678d Merge remote-tracking branch 'origin/master' 2016-07-19 18:21:38 +05:30
Noble Paul 2d1496c83d SOLR-7280: refactored to incorporate Mike's suggestions. Default thread count for cloud is limited to 8 now. In our internal teting 8 has given us the best stability during restarts 2016-07-19 18:21:23 +05:30
Christine Poerschke 832dacffc8 SOLR-9275: fix NPE in SolrCoreParser.init 2016-07-19 11:28:57 +01:00
Chris Hostetter 4123b3bf26 SOLR-9285: Fixed AIOOBE when using ValueSourceAugmenter in single node RTG 2016-07-18 10:21:08 -07:00
Christine Poerschke 6f76ac1314 SOLR-9275: make XML QueryParser support (defType=xmlparser) extensible via configuration 2016-07-18 15:45:33 +01:00
Shalin Shekhar Mangar 05b38f5f21 SOLR-7362: Log the actual payload being sent to Solr 2016-07-18 10:59:23 +05:30
Noble Paul 74633594d8 SOLR-7280: precommit errors 2016-07-16 19:54:43 +05:30
Noble Paul 6c1b75b06b SOLR-7280: In cloud-mode sort the cores smartly before loading & limit threads to improve cluster stability 2016-07-16 19:12:59 +05:30
Jan Høydahl 4f45226174 SOLR-9237: Make FvhContainer public 2016-07-16 11:51:06 +02:00
Shalin Shekhar Mangar 833c8ee152 SOLR-9290: MockCoreContainer should call super.shutdown() 2016-07-16 00:59:35 +05:30
Steve Rowe 51d4af6859 LUCENE-7013: add licence header position checker to -validate-source-patterns, and fix the violations it found 2016-07-13 13:21:36 -04:00
Christine Poerschke 15e8719b8a LUCENE-7372: Factor out an org.apache.lucene.search.FilterWeight class. 2016-07-13 16:04:24 +01:00
Varun Thacker eefdc62c99 SOLR-9242: Move license headers to the top + force refresh cluster propery before reading the 'location' param 2016-07-13 14:42:19 +05:30
Adrien Grand e92a38af90 LUCENE-7355: Add Analyzer#normalize() and use it in query parsers. 2016-07-12 16:33:07 +02:00
Adrien Grand 5def78ba10 LUCENE-7368: Remove queryNorm. 2016-07-12 14:38:36 +02:00
Chris Hostetter 462dc04cb6 SOLR-9287: Including 'score' in the 'fl' param when doing an RTG no longer causes an NPE 2016-07-11 14:35:06 -07:00
Mike McCandless df9efb8b6d LUCENE-7373: deprecate Directory.renameFile, which both renamed and fsync'd the directory, replacing it with separate rename and syncMetaData methods 2016-07-11 11:15:46 -04:00
Noble Paul 74de196565 SOLR-8995: Use Lamdas for Thread/Runnable 2016-07-11 19:29:15 +05:30
Shalin Shekhar Mangar 42e1caf2bf SOLR-9291: ZkSolrResourceLoader should not retry fetching resources if the server has been shutdown 2016-07-11 07:35:10 +05:30
David Smiley 360b9a3528 SOLR-9270: spatialContextFactory now accepts "JTS" alias. Spatial config attributes with old package names are now rewritten with a warning. 2016-07-09 10:49:12 -04:00
markrmiller 91a9d96454 SOLR-9236: Don't use System.currentTimeMillis. 2016-07-07 20:31:53 -04:00
markrmiller c588415583 SOLR-9236: Fix import. 2016-07-07 12:47:03 -04:00
markrmiller 546093812c SOLR-9236: AutoAddReplicas will append an extra /tlog to the update log location on replica failover. 2016-07-07 09:37:28 -04:00
Adrien Grand f1528bf338 LUCENE-7369: Similarity.coord and BooleanQuery.disableCoord are removed. 2016-07-07 10:02:29 +02:00
Shalin Shekhar Mangar 24d6b78469 SOLR-8858: SolrIndexSearcher#doc() completely ignores field filters unless lazy field loading is enabled. 
This closes #47.
 2016-07-07 13:22:15 +05:30
Erick 7743718d29 SOLR-9277: Clean up some more remnants of supporting old and new style solr.xml in tests 2016-07-06 19:51:06 -07:00
Chris Hostetter 1125a8a8ef Merge remote-tracking branch 'refs/remotes/origin/master' (SOLR-9180) 2016-07-06 14:25:40 -07:00
Shalin Shekhar Mangar 380c5a6b97 SOLR-9207: PeerSync recovery failes if number of updates requested is high. A new useRangeVersions config option is introduced (defaults to true) to send version ranges instead of individual versions for peer sync. 2016-07-07 02:32:45 +05:30
Chris Hostetter ae316f1e39 SOLR-9180: More comprehensive tests of psuedo-fields for RTG and SolrCloud requests 
This commit also includes new @AwaitsFix'ed tests for the following known issues...

 * SOLR-9285 ArrayIndexOutOfBoundsException when ValueSourceAugmenter used with RTG on uncommitted doc
 * SOLR-9286 SolrCloud RTG: psuedo-fields (like ValueSourceAugmenter, [shard], etc...) silently fails (even for committed doc)
 * SOLR-9287 single node RTG: NPE if score is requested
 * SOLR-9288 RTG: fl=[docid] silently missing for uncommitted docs
 * SOLR-9289 SolrCloud RTG: fl=[docid] silently ignored for all docs
 2016-07-06 13:42:21 -07:00
jbernste ad8b22d0b2 SOLR-9193: Fix conflict between parameters of TermsComponent and json facet API 2016-07-06 14:06:38 -04:00
jbernste 360c4da90b SOLR-9193: fixing failing tests due to changes in TermsComponent 2016-07-06 14:06:38 -04:00
jbernste e1f51a20d7 SOLR-9193: Add scoreNodes Streaming Expression 2016-07-06 14:06:38 -04:00
jbernste 551bdc6f53 SOLR-9243:Add terms.list parameter to the TermsComponent to fetch the docFreq for a list of terms 2016-07-06 14:06:37 -04:00
Varun Thacker 5fadc4ee23 SOLR-9088: Fixed TestManagedSchemaAPI failures which exposed race conditions in the schema API 2016-07-06 14:08:05 +05:30
Varun Thacker bfe5c5ae49 SOLR-9242: Collection backup/restore to provide a param for specifying underlying storage repository to use 2016-07-06 13:18:13 +05:30
Chris Hostetter 54b3945572 SOLR-9235: Fixed NPE when using non-numeric range query in deleteByQuery 2016-07-05 14:18:55 -07:00
Alan Woodward e6e0765e86 SOLR-9181: Add some logging to ZkStateReader to try and debug test failures 2016-07-05 10:46:43 +01:00
Shalin Shekhar Mangar 8653be9a5b SOLR-8048: Stop using deprecated CollectionAdminRequest.Reload constructor 2016-07-05 12:53:35 +05:30
Shalin Shekhar Mangar 2d6b7ea966 SOLR-8048: Close the http client in a finally clause at the end of the test 2016-07-05 12:48:04 +05:30
Erick 32e0f5fd25 SOLR-9276: Remove remnants of old-style core definitions from OpenCloseCoreStressTest 2016-07-04 17:13:39 -07:00
Erick Erickson 9dd9a6fc91 SOLR-9194: Enhance the bin/solr script to perform file operations to/from Zookeeper. Windows text fix 3 2016-07-04 10:25:40 -07:00
Erick Erickson 65c34857f8 SOLR-9194: Enhance the bin/solr script to perform file operations to/from Zookeeper. More Windows fixes 2016-07-03 17:14:25 -07:00
Erick Erickson 961eaf9add SOLR-9194: Enhance the bin/solr script to perform file operations to/from Zookeeper - Fix Windows failures 2016-07-02 16:07:38 -07:00
Erick a851d5f557 SOLR-9194: Enhance the bin/solr script to perform file operations to/from Zookeeper 2016-07-02 10:25:44 -07:00
Alan Woodward cefab1dffc SOLR-9181: Fix some races in ZkStateReader collection watch updates 2016-07-01 15:47:47 +01:00
Noble Paul 06cb145f12 Merge remote-tracking branch 'origin/master' 2016-07-01 17:37:52 +05:30
Noble Paul df9fb16b46 SOLR-9251: Support for a new tag 'role' in replica placement rules 2016-07-01 17:37:36 +05:30
Shalin Shekhar Mangar 51fde1cbf9 SOLR-9262: Connection and read timeouts are being ignored by UpdateShardHandler after SOLR-4509 2016-07-01 13:16:46 +05:30
Shalin Shekhar Mangar 6674969a89 SOLR-9262: Revert changes 2016-07-01 12:58:56 +05:30
Shalin Shekhar Mangar 2b4420c473 SOLR-9262: Connection and read timeouts are being ignored by UpdateShardHandler after SOLR-4509 2016-07-01 12:47:05 +05:30
Shalin Shekhar Mangar 0a15699caa SOLR-8787: Shutdown MiniSolrCloudCluster in a finally block 2016-06-30 22:32:23 +05:30
Shalin Shekhar Mangar 6528dacb0e SOLR-8787: TestAuthenticationFramework should not extend TestMiniSolrCloudCluster 2016-06-30 19:50:17 +05:30
Shalin Shekhar Mangar 74c86063cf SOLR-9264: Remove unused imports 2016-06-30 18:20:11 +05:30
Shalin Shekhar Mangar 015e0fc1cf SOLR-9264: Optimize ZkController.publishAndWaitForDownStates to not read all collection states and watch relevant collections instead 2016-06-30 15:22:57 +05:30
Noble Paul 1dc7480bcd SOLR-9216: Support collection.configName in MODIFYCOLLECTION request 2016-06-30 12:10:36 +05:30
Shalin Shekhar Mangar 4ea95bf8f1 SOLR-8777: Duplicate Solr process can cripple a running process 2016-06-29 14:49:59 +05:30
Alan Woodward 23119db360 LUCENE-7360: Explanation.toHtml() is deprecated 2016-06-29 09:13:29 +01:00
Tomas Fernandez Lobbe 4070bdd8d8 SOLR-8657: Fix SolrRequestInfo error logs if QuerySenderListener is being used 2016-06-28 13:11:40 -07:00
jbernste 407080af5b SOLR-9254: GraphTermsQueryQParserPlugin throws NPE when field being search is not present in segment 2016-06-28 13:03:34 -04:00
Varun Thacker 36183cad87 SOLR-7374: Fixing test failures like build #3366. Index a minimum of 1 doc 2016-06-27 12:08:45 +05:30
Jan Høydahl 7eb77027bb SOLR-9237: DefaultSolrHighlighter.doHighlightingByFastVectorHighlighter can't be overidden 2016-06-26 23:59:59 +02:00
Erick bc1237a646 SOLR-8546: TestLazyCores is failing a lot on the Jenkins cluster. 2016-06-23 20:49:27 -07:00
Gregory Chanan f273cb1b3a SOLR-9076: Update to Hadoop 2.7.2 2016-06-23 13:41:15 -07:00
Varun Thacker 07be2c42ba SOLR-7374: Core level backup/restore now supports specifying a directory implementation 2016-06-23 23:49:28 +05:30
markrmiller 740198f33d SOLR-9219: Make hdfs blockcache read buffer sizes configurable and improve cache concurrency. 2016-06-21 13:06:10 -04:00
Adrien Grand 281af8b89c LUCENE-7350: Remove unused imports. 2016-06-21 17:51:36 +02:00
Noble Paul 060cacfdab SOLR-9234: srcField parameter works only when all fields are captured in the /update/json/docs endpoint 2016-06-21 18:50:49 +05:30
Tommaso Teofili fcf4389d82 LUCENE-7350 - Let classifiers be constructed from IndexReaders 2016-06-21 13:10:34 +02:00
Adrien Grand c52a71797d SOLR-8995: Remove unused imports. 2016-06-20 09:57:09 +02:00
Adrien Grand dc95f6d62a LUCENE-7317: Remove auto-prefix terms. 2016-06-20 09:23:09 +02:00
Noble Paul bd9005d562 SOLR-8995: replace SAM implementations with lambda 2016-06-20 11:11:18 +05:30
Uwe Schindler 0179b3fb2d LUCENE-7346: Update forbiddenapis to version 2.2 2016-06-19 21:27:34 +02:00
Mike McCandless 55fc01bc45 LUCENE-7335: IW's commit data is now late binding 2016-06-17 05:39:50 -04:00
Christine Poerschke 651499c82d SOLR-9195: remove unnecessary allocation and null check in UpdateRequestProcessorChain.getReqProcessors 2016-06-15 12:12:23 +01:00
Mike McCandless 87016b5f0c LUCENE-7318: graduate StandardAnalyzer and make it the default for IndexWriterConfig 2016-06-14 16:38:04 -04:00
Noble Paul 5eabffc797 SOLR-8048: bin/solr script should support basic auth credentials provided in solr.in.sh 2016-06-14 20:08:08 +05:30
Noble Paul 5ee4e8a614 SOLR-8048: bin/solr script should support basic auth credentials provided in solr.in.sh 2016-06-14 19:47:18 +05:30
Noble Paul 2e101c42ca SOLR-8048: bin/solr script should support basic auth credentials provided in solr.in.sh 2016-06-14 19:43:48 +05:30
Noble Paul ccf2070e53 Merge remote-tracking branch 'origin/master' 2016-06-14 19:38:23 +05:30
Noble Paul 97e696dd50 SOLR-8048: bin/solr script should support basic auth credentials provided in solr.in.sh 2016-06-14 19:37:45 +05:30
Adrien Grand bd7ddb8fbf SOLR-9204: Remove unused imports. 2016-06-14 10:25:23 +02:00
markrmiller 08c14f1356 SOLR-9204: Improve performance of getting directory size with hdfs. 2016-06-13 12:22:50 -04:00
Adrien Grand 5e2677e0fb LUCENE-7319: Remove more unused imports. 2016-06-13 15:24:10 +02:00
Christine Poerschke 038fe9378d SOLR-9161: change SolrPluginUtils.invokeSetters implementation to accommodate setter variants 2016-06-13 13:05:08 +01:00
Christine Poerschke 52f5c50246 LUCENE-7319: remove unused imports 2016-06-13 09:59:14 +01:00
Noble Paul 232b44e283 SOLR-8744: Minimize the impact on ZK when there are a lot of blocked tasks 2016-06-12 13:11:07 +05:30
Erick Erickson 844ca4a348 SOLR-9187: Support dates and booleans in /export handler, support boolean DocValues fields 2016-06-11 17:38:19 -07:00
Erick Erickson 79d1b8c227 SOLR-9187: Support dates and booleans in /export handler, support boolean DocValues fields 2016-06-11 17:33:25 -07:00
Alan Woodward 0eacfe87c2 SOLR-9176: Fix facet method fallback selection 2016-06-10 15:40:25 +01:00
Steve Rowe 3871439976 SOLR-8812: edismax: turn off mm processing if no explicit mm spec is provided and there are explicit operators (except for AND) - addresses problems caused by SOLR-2649 2016-06-10 02:29:26 -04:00
Gregory Chanan d55cc8f293 SOLR-9199: ZkController#publishAndWaitForDownStates logic is inefficient 2016-06-09 13:24:29 -07:00
Mike McCandless 067fb25e43 LUCENE-7323: compound file writing now verifies checksum and segment ID for the incoming sub-files, to catch hardware issues or filesystem bugs earlier 2016-06-09 14:48:58 -04:00
Scott Blum 7e86ba8c73 SOLR-9191: use a Predicate instead of a Function 2016-06-09 13:57:11 -04:00
Noble Paul 98f7ab5137 Merge remote-tracking branch 'origin/master' 2016-06-09 11:47:23 +05:30
Noble Paul 84c6e9a477 SOLR-7123: echo shows wrong output, and added a test for multi level nesting 2016-06-09 11:47:04 +05:30
Noble Paul fdf2bbbdb1 SOLR-7123: echo shows wrong output, and added a test for multi level nesting 2016-06-09 11:34:06 +05:30
Scott Blum ed2621de84 SOLR-9191: OverseerTaskQueue.peekTopN() fatally flawed 2016-06-09 00:59:03 -04:00
Noble Paul be01109744 SOLR-9198: config APIs unable to add multiple values with same name 2016-06-09 00:32:35 +05:30
David Smiley fb37b3eb8c SOLR-8859: Fix AbstractSpatialFieldType to not cycle through all Spatial4j provided formats. 
And Fix RptWithGeometrySpatialField to be less brittle on init()
 2016-06-07 16:48:34 -04:00
Noble Paul 66cd0edc52 SOLR-7123: Syntax modified. Multiple paths can be added in the split parameter itself (pipe separated) 2016-06-07 13:31:40 -07:00
Uwe Schindler 5c672e14f8 Fix temp dir usage in ZkCLI test 2016-06-07 10:52:03 +02:00
Alan Woodward b64c558e3e Revert "SOLR-9140: Replace some zk state polling with CollectionStateWatchers" 
There's still some places where notifications can be missed, so I'm reverting
this until those are fixed.

This reverts commit d550b1ca43.
 2016-06-06 13:13:54 +01:00
Alan Woodward 1e2ba9fe9b Revert "SOLR-9181: Fix test bug in ZkStateReaderTest" 
This reverts commit 950fd91335.
 2016-06-04 11:05:44 +01:00
Alan Woodward d550b1ca43 SOLR-9140: Replace some zk state polling with CollectionStateWatchers 2016-06-03 15:50:23 +01:00
Alan Woodward 950fd91335 SOLR-9181: Fix test bug in ZkStateReaderTest 2016-06-03 15:12:50 +01:00
Chris Hostetter 1eb6c9f816 SOLR-9182: SuppressSSL on some tests where it's non to cause OOM 2016-06-02 11:27:59 -07:00
Noble Paul 9863d3d2d7 Merge remote-tracking branch 'origin/master' 2016-06-02 14:48:10 +05:30
Noble Paul 459a9c77a6 SOLR-8744: Overseer operations performed with fine grained mutual exclusion 2016-06-02 14:47:57 +05:30
Chris Hostetter 09372acb66 SOLR-9107: new @RandomizeSSL annotation for more fine grained control of SSL testing 2016-06-01 14:34:31 -07:00
Chris Hostetter 245e4839d1 Revert "SOLR-9161: SolrPluginUtils.invokeSetters now accommodates setter variants" 
This reverts commit 50658dd93d.

Conflicts:
	solr/CHANGES.txt
 2016-06-01 09:58:27 -07:00
Noble Paul 34d9f0a7a3 SOLR-7123: '/update/json/docs' path supports nested documents 2016-06-01 18:33:54 +05:30
Chris Hostetter 18256fc287 SOLR-8940: Fix group.sort option 2016-05-31 16:12:24 -07:00
Jan Høydahl 05ce40a0b9 SOLR-8583: Do not attempt highlight of alternate if it is same as original hl field 2016-05-30 10:24:23 +02:00
Jan Høydahl e37e49ed46 SOLR-8583: Apply highlighting to hl.alternateField by default. 2016-05-29 00:34:32 +02:00
Erick 49c81bd869 SOLR-9136: Separate out the error statistics into server-side error vs client-side error 2016-05-28 09:16:11 -07:00
Mikhail Khludnev 2391b5b81d SOLR-9110: removing static members from tests. 2016-05-27 23:59:47 +03:00
Christine Poerschke 50658dd93d SOLR-9161: SolrPluginUtils.invokeSetters now accommodates setter variants 2016-05-27 19:07:06 +01:00
Mikhail Khludnev ffa2d65efe SOLR-9110: moving JoinFromCollection- SubQueryTransformer- BlockJoinFacet- Distrib Tests to SolrCloudTestCase 2016-05-27 13:47:17 +03:00
jdyer1 164128f977 SOLR-9165: disable "cursorMark" when testing for valid SpellCheck Collations 2016-05-26 14:46:43 -05:00
Noble Paul 366f8d18fe Merge remote-tracking branch 'origin/master' 2016-05-25 23:12:11 +05:30
Noble Paul a42dc35883 SOLR-8995: Replace anonymous implementations of SAM interfaces with Lambdas 2016-05-25 23:11:59 +05:30
Mike McCandless baa5344e68 LUCENE-7283: move SlowCompositeReaderWrapper and uninverting to solr 2016-05-25 05:36:32 -04:00
Chris Hostetter e9f65fe0f8 SOLR-9119: several static methods in ValueSourceParser have been made private 2016-05-24 15:45:52 -07:00
Chris Hostetter 19044afed4 SOLR-9159: New cloud based concurrent atomic update test 2016-05-24 13:30:13 -07:00
Jan Høydahl 50c4f58276 SOLR-9151: Fix SolrCLI so that bin/solr -e cloud example can be run from any CWD 2016-05-24 12:56:31 +02:00
Dawid Weiss e44509f2df LUCENE-7277: Make Query.hashCode and Query.equals abstract. 2016-05-24 10:33:15 +02:00
Alan Woodward 196f4530a2 Revert "SOLR-9132: Fix request-counting logic in ConnectionReuseTest" 
The logic for request-counting is different in master and 6.x, due to the
difference in HttpClient implementations.

This reverts commit a35057fff2.
 2016-05-24 08:35:16 +01:00
Noble Paul ba46eb7be4 Merge remote-tracking branch 'origin/master' 2016-05-24 10:39:25 +05:30
Noble Paul 5a18599892 improved logging for debug errors such as these SOLR-9143 2016-05-24 10:39:11 +05:30
Dennis Gove e4e990b993 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:13:37 -04:00
Christine Poerschke 1b809e784a SOLR-9134: Fix RestManager.addManagedResource return value. 2016-05-23 16:22:20 +01:00
Alan Woodward a35057fff2 SOLR-9132: Fix request-counting logic in ConnectionReuseTest 2016-05-23 15:27:23 +01:00
Noble Paul eae605b532 Merge remote-tracking branch 'origin/master' 2016-05-23 12:05:53 +05:30
Noble Paul 55e3fd9ddf more logging for debug errors such as these SOLR-9143 2016-05-23 12:05:17 +05:30
Mikhail Khludnev 3ea12f2be4 SOLR-9147: using BAOS from commons io 2.5 in EmbeddedSolrServer to avoid array resize. 2016-05-23 00:10:17 +03:00
Steve Rowe b922033517 SOLR-8801: /bin/solr create script always returns exit code 0 when a collection/core already exists 2016-05-20 19:36:39 -04:00
Uwe Schindler b9caf83bfa LUCENE-7292: Use '-release' instead of '-source/-target' during compilation on Java 9+ to ensure real cross-compilation 2016-05-20 22:20:39 +02:00
Alan Woodward ee5836746c SOLR-9132: Move some tests to SolrCloudTestBase 2016-05-19 16:43:31 +01:00
jbernste 97fd7988ae SOLR-9128: Fix error handling issues in Streaming classes 2016-05-18 21:52:53 -04:00
Shalin Shekhar Mangar d6a5c5a539 SOLR-9116: Race condition causing occasional SolrIndexSearcher leak when SolrCore is reloaded 2016-05-18 20:15:52 +05:30
Shalin Shekhar Mangar d1202a8f8d SOLR-9117: The first SolrCore is leaked after reload 2016-05-18 02:02:30 +05:30
jbernste f8d1012717 SOLR-9118: HashQParserPlugin should trim partition keys 2016-05-17 14:10:54 -04:00
Alan Woodward 2b9cbe97a8 SOLR-9113: Improve state watcher API 2016-05-17 10:34:06 +01:00
Uwe Schindler ae93f4e7ac Move non-inner classes to separate files: This breaks IDEs and update checks by javac 2016-05-16 19:54:10 +02:00
Uwe Schindler 6620fd1421 SOLR-9115: Get rid of javax.xml.bind.DatatypeConverter in Solr's SimplePostTool 2016-05-16 18:01:32 +02:00
Alan Woodward 77962f4af4 SOLR-9106: Cache cluster properties on ZkStateReader 2016-05-14 10:06:36 +01:00
Alan Woodward b6d7421412 SOLR-8323: Add CollectionStateWatcher API 2016-05-13 21:34:16 +01:00
Mikhail Khludnev 3b0a79a13e SOLR-8208: fixing TestSubQueryTransformerDistrib by passing reasonable numbers in creatCollection() 2016-05-13 23:23:50 +03:00
David Smiley 4193e60b9f SOLR-9080 SOLR-9085: Fix date math before the year 1582. 
note: DateMathParser no longer needs a Locale
 2016-05-13 10:03:24 -04:00
Mike McCandless d715210467 LUCENE-6766: merged 2016-05-13 04:31:29 -04:00