SOLR-4992: Solr eats OutOfMemoryError exceptions in many cases.

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1557778 13f79535-47bb-0310-9956-ffa450edef68
SOLR-5463: added randomized faceting test to CursorPagingTest

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1557800 13f79535-47bb-0310-9956-ffa450edef68
SOLR-5540: Move CHANGES entry to 4.6 branch

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1557849 13f79535-47bb-0310-9956-ffa450edef68
clean up CHANGES

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1557853 13f79535-47bb-0310-9956-ffa450edef68
Do not remove the numDocIds method unless others prefer that.
No need to check for instance of cacheable DocIdSet in cacheImpl()
LUCENE-5354: BlendedInfixSuggester: fix wrong return (0 instead of -1) from the LookupResult comparator

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1558100 13f79535-47bb-0310-9956-ffa450edef68
Merge branch 'trunk' into efdiscache
Merge branch 'efdiscache' into LUCENE-5293

Conflicts:
	efdiscache-PlanJournal.txt