LUCENE-4775: move computation of merge bytes size earlier

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1448628 13f79535-47bb-0310-9956-ffa450edef68
LUCENE-4778: fix code example in jdoc

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1448631 13f79535-47bb-0310-9956-ffa450edef68
SOLR-824: remove last vestige of 'none' as a lockType

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1448773 13f79535-47bb-0310-9956-ffa450edef68
LUCENE-4784, LUCENE-4785, LUCENE-4786: Fixed references to deprecated classes SinkTokenizer, ValueSourceQuery and RangeQuery.


git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1448852 13f79535-47bb-0310-9956-ffa450edef68
LUCENE-4792: Reduction of the memory required to build the doc ID maps used when merging segments.


git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1448853 13f79535-47bb-0310-9956-ffa450edef68
SOLR-3060: SurroundQParserPlugin highlighting tests

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1448863 13f79535-47bb-0310-9956-ffa450edef68
SOLR-4472: jdoc updates for DateField and UUIDField refering to TimestampUpdateProcessorFactory and UUIDUpdateProcessorFactory

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1448879 13f79535-47bb-0310-9956-ffa450edef68
LUCENE-4782 - suppressing SNBC test for Lucene3x codec for now

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1448932 13f79535-47bb-0310-9956-ffa450edef68
sort file list

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1449053 13f79535-47bb-0310-9956-ffa450edef68
SOLR-4471: Replication occurs even when a slave is already up to date.
  
SOLR-4484: ReplicationHandler#loadReplicationProperties still uses Files rather than the Directory to try and read the replication properties files.

SOLR-4488: Return slave replication details for a master if the master has also acted like a slave.

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1449115 13f79535-47bb-0310-9956-ffa450edef68
LUCENE-4791: optimize ConjunctionTermScorer to use skipping on first term

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1449141 13f79535-47bb-0310-9956-ffa450edef68
SOLR-4352: /browse pagination now supports and preserves sort context

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1449179 13f79535-47bb-0310-9956-ffa450edef68
SOLR-2470: Added more tests for VelocityResponseWriter (merged from lucene_4x r1449183)

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1449188 13f79535-47bb-0310-9956-ffa450edef68
SOLR-2470: Added more tests for VelocityResponseWriter (merged from lucene_4x r1449183)

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1449189 13f79535-47bb-0310-9956-ffa450edef68
SOLR-2470: Added more tests for VelocityResponseWriter (merged from lucene_4x r1449183)

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1449190 13f79535-47bb-0310-9956-ffa450edef68
SOLR-2470: Added more tests for VelocityResponseWriter (merged from lucene_4x r1449183)

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1449191 13f79535-47bb-0310-9956-ffa450edef68
SOLR-2470: Added more tests for VelocityResponseWriter (merged from lucene_4x r1449183)

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1449192 13f79535-47bb-0310-9956-ffa450edef68
SOLR-2470: Added more tests for VelocityResponseWriter (merged from lucene_4x r1449183)

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1449193 13f79535-47bb-0310-9956-ffa450edef68
SOLR-2856: Fix schema (scheam) typo in test configurations

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1449211 13f79535-47bb-0310-9956-ffa450edef68
SOLR-4471: Improve and clean up TestReplicationHandler.

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