You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ab...@apache.org on 2018/12/17 23:28:31 UTC

[4/4] lucene-solr:jira/solr-12259: Merge branch 'master' into jira/solr-12259

Merge branch 'master' into jira/solr-12259


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/010ca9e5
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/010ca9e5
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/010ca9e5

Branch: refs/heads/jira/solr-12259
Commit: 010ca9e548fd4fde6cf69b96511c33ff2928e288
Parents: d2c8e96 f547938
Author: Andrzej Bialecki <ab...@apache.org>
Authored: Tue Dec 18 00:28:04 2018 +0100
Committer: Andrzej Bialecki <ab...@apache.org>
Committed: Tue Dec 18 00:28:04 2018 +0100

----------------------------------------------------------------------
 dev-tools/doap/lucene.rdf                       |    7 +
 dev-tools/doap/solr.rdf                         |    7 +
 lucene/CHANGES.txt                              |   47 +-
 lucene/MIGRATE.txt                              |    6 +
 .../miscellaneous/TestEmptyTokenStream.java     |    2 +-
 .../lucene/analysis/ko/dict/UserDictionary.java |    6 +-
 .../index/TestBackwardsCompatibility.java       |   42 +-
 .../org/apache/lucene/index/index.7.6.0-cfs.zip |  Bin 0 -> 15655 bytes
 .../apache/lucene/index/index.7.6.0-nocfs.zip   |  Bin 0 -> 15649 bytes
 .../lucene/index/sorted-invalid.7.5.0.zip       |  Bin 0 -> 908443 bytes
 .../org/apache/lucene/index/sorted.7.6.0.zip    |  Bin 0 -> 74541 bytes
 .../lucene/codecs/lucene70/IndexedDISI.java     |  114 +-
 .../codecs/lucene70/IndexedDISICache.java       |  330 --
 .../lucene70/IndexedDISICacheFactory.java       |  260 --
 .../lucene/codecs/lucene70/LongCompressor.java  |  251 --
 .../lucene70/Lucene70DocValuesProducer.java     |  250 +-
 .../codecs/lucene70/Lucene70NormsProducer.java  |    8 +-
 .../java/org/apache/lucene/document/Field.java  |   14 +-
 .../org/apache/lucene/document/StoredField.java |   13 +
 .../apache/lucene/index/BufferedUpdates.java    |    6 +-
 .../lucene/index/DocValuesFieldUpdates.java     |   75 +-
 .../apache/lucene/index/FieldUpdatesBuffer.java |   21 +
 .../lucene/index/FreqProxTermsWriter.java       |   41 +-
 .../lucene/index/FrozenBufferedUpdates.java     |  216 +-
 .../org/apache/lucene/index/IndexWriter.java    |   65 +-
 .../org/apache/lucene/index/IndexableField.java |    7 +
 .../org/apache/lucene/index/MultiSorter.java    |   30 +-
 .../index/NumericDocValuesFieldUpdates.java     |   31 +-
 .../apache/lucene/search/MatchAllDocsQuery.java |    4 +-
 .../org/apache/lucene/util/BytesRefArray.java   |    3 +-
 .../apache/lucene/util/BytesRefIterator.java    |   10 +-
 .../java/org/apache/lucene/util/Constants.java  |    1 +
 .../java/org/apache/lucene/util/RankBitSet.java |  302 --
 .../util/packed/AbstractPagedMutable.java       |    3 +-
 .../lucene/codecs/lucene70/TestIndexedDISI.java |  125 +-
 .../codecs/lucene70/TestLongCompressor.java     |   87 -
 .../perfield/TestPerFieldPostingsFormat2.java   |   12 +-
 .../org/apache/lucene/index/TestAddIndexes.java |   62 +-
 .../index/TestConcurrentMergeScheduler.java     |    2 +-
 .../test/org/apache/lucene/index/TestCrash.java |    2 +-
 .../apache/lucene/index/TestDeletionPolicy.java |    8 +-
 .../org/apache/lucene/index/TestDocValues.java  |  109 +-
 .../lucene/index/TestDocValuesFieldUpdates.java |   59 +-
 .../lucene/index/TestFieldUpdatesBuffer.java    |   24 +-
 .../index/TestFlushByRamOrCountsPolicy.java     |   16 +-
 .../lucene/index/TestFrozenBufferedUpdates.java |  104 +
 .../lucene/index/TestIndexManyDocuments.java    |    2 +-
 .../apache/lucene/index/TestIndexSorting.java   | 1740 ++++----
 .../apache/lucene/index/TestIndexWriter.java    |   45 +-
 .../lucene/index/TestIndexWriterCommit.java     |    2 +-
 .../lucene/index/TestIndexWriterDelete.java     |    2 +-
 .../lucene/index/TestIndexWriterFromReader.java |   20 +-
 .../lucene/index/TestIndexWriterMaxDocs.java    |    6 +-
 .../index/TestIndexWriterMergePolicy.java       |    2 +-
 .../lucene/index/TestIndexWriterMerging.java    |    8 +-
 .../lucene/index/TestIndexWriterReader.java     |    4 +-
 .../org/apache/lucene/index/TestIsCurrent.java  |    8 +-
 .../apache/lucene/index/TestRollingUpdates.java |    2 +-
 .../TestSoftDeletesRetentionMergePolicy.java    |   20 +-
 .../lucene/index/TestThreadedForceMerge.java    |    4 +-
 .../lucene/index/TestTieredMergePolicy.java     |   31 +-
 .../org/apache/lucene/search/TestBoolean2.java  |    2 +-
 .../lucene/search/TestMatchAllDocsQuery.java    |   23 +
 .../lucene/search/TestSearcherManager.java      |    2 +-
 .../lucene/store/TestByteBuffersDirectory.java  |    2 +-
 .../apache/lucene/store/TestRAMDirectory.java   |    2 +-
 .../org/apache/lucene/util/TestRankBitSet.java  |  107 -
 .../directory/DirectoryTaxonomyWriter.java      |    4 +-
 lucene/ivy-versions.properties                  |   18 +-
 lucene/licenses/hamcrest-core-1.3.jar.sha1      |    1 +
 lucene/licenses/hamcrest-core-LICENSE-BSD.txt   |   27 +
 lucene/licenses/hamcrest-core-NOTICE.txt        |    0
 lucene/licenses/junit-4.10.jar.sha1             |    1 -
 lucene/licenses/junit-4.12.jar.sha1             |    1 +
 .../randomizedtesting-runner-2.6.4.jar.sha1     |    1 -
 .../randomizedtesting-runner-2.7.2.jar.sha1     |    1 +
 .../lucene/index/memory/TestMemoryIndex.java    |    2 +-
 .../lucene/queries/mlt/TestMoreLikeThis.java    |    2 +-
 .../document/LatLonShapeBoundingBoxQuery.java   |  269 +-
 .../java/org/apache/lucene/geo/Rectangle2D.java |  315 ++
 .../intervals/DifferenceIntervalFunction.java   |   10 +
 .../intervals/DisjunctionIntervalsSource.java   |   15 +
 .../intervals/FilteredIntervalsSource.java      |  103 +
 .../lucene/search/intervals/IntervalFilter.java |    5 +
 .../search/intervals/IntervalFunction.java      |   54 +-
 .../search/intervals/IntervalIterator.java      |   11 +
 .../search/intervals/IntervalMatches.java       |    9 +
 .../intervals/IntervalMatchesIterator.java      |   38 +
 .../lucene/search/intervals/Intervals.java      |   23 +-
 .../intervals/LowpassIntervalsSource.java       |   90 -
 .../MinimizingConjunctionIntervalsSource.java   |    7 +-
 .../search/intervals/TermIntervalsSource.java   |    5 +
 .../lucene/search/intervals/package-info.java   |    2 +
 .../org/apache/lucene/geo/TestRectangle2D.java  |  100 +
 .../search/intervals/TestIntervalQuery.java     |   10 +
 .../lucene/search/intervals/TestIntervals.java  |   61 +-
 .../spatial3d/geom/GeoComplexPolygon.java       |    2 +-
 .../apache/lucene/spatial3d/geom/GeoPoint.java  |   34 +-
 lucene/test-framework/ivy.xml                   |    1 +
 .../apache/lucene/index/RandomIndexWriter.java  |    8 +-
 .../ThreadedIndexingAndSearchingTestCase.java   |    2 +-
 lucene/tools/junit4/solr-tests.policy           |   26 +-
 solr/CHANGES.txt                                |   39 +-
 solr/NOTICE.txt                                 |    6 +
 solr/bin/solr                                   |    9 +-
 .../dataimport/TestHierarchicalDocBuilder.java  |    1 +
 .../solr/ltr/feature/TestExternalFeatures.java  |    4 +-
 .../model/TestMultipleAdditiveTreesModel.java   |    2 +-
 .../solr/client/solrj/embedded/JettyConfig.java |   15 +-
 .../client/solrj/embedded/JettySolrRunner.java  |   50 +-
 .../solr/client/solrj/embedded/SSLConfig.java   |  166 -
 .../solr/cloud/OverseerTaskProcessor.java       |    2 +-
 .../cloud/autoscaling/NodeAddedTrigger.java     |    3 +-
 .../solr/cloud/autoscaling/NodeLostTrigger.java |    5 +-
 .../org/apache/solr/core/CoreContainer.java     |   57 +-
 .../src/java/org/apache/solr/core/SolrCore.java |   98 +-
 .../java/org/apache/solr/core/SolrInfoBean.java |    2 +-
 .../handler/component/HttpShardHandler.java     |   26 +-
 .../component/HttpShardHandlerFactory.java      |  144 +-
 .../handler/component/ShardHandlerFactory.java  |   10 +-
 .../solr/response/BinaryResponseWriter.java     |  121 +-
 .../org/apache/solr/response/DocsStreamer.java  |    6 +-
 .../org/apache/solr/response/ResultContext.java |    2 +
 .../java/org/apache/solr/schema/FieldType.java  |    7 +
 .../org/apache/solr/schema/IndexSchema.java     |   10 +-
 .../java/org/apache/solr/schema/StrField.java   |    6 +
 .../java/org/apache/solr/schema/TextField.java  |    5 +
 .../apache/solr/search/SolrDocumentFetcher.java |   24 +-
 .../similarities/BM25SimilarityFactory.java     |   11 +-
 .../LegacyBM25SimilarityFactory.java            |   64 +
 .../similarities/SchemaSimilarityFactory.java   |   12 +-
 .../solr/security/AuthenticationPlugin.java     |  129 +-
 .../apache/solr/security/BasicAuthPlugin.java   |  213 +-
 .../ConfigurableInternodeAuthHadoopPlugin.java  |    6 +
 .../security/DelegationTokenKerberosFilter.java |    5 +
 .../apache/solr/security/HadoopAuthFilter.java  |    5 +
 .../apache/solr/security/HadoopAuthPlugin.java  |   35 +-
 .../solr/security/HttpClientBuilderPlugin.java  |    5 +
 .../apache/solr/security/KerberosFilter.java    |    8 +-
 .../apache/solr/security/KerberosPlugin.java    |    6 +
 .../solr/security/PKIAuthenticationPlugin.java  |   69 +-
 .../security/Sha256AuthenticationProvider.java  |    7 +-
 .../org/apache/solr/servlet/HttpSolrCall.java   |    1 +
 .../apache/solr/servlet/SolrDispatchFilter.java |   45 +-
 .../apache/solr/update/SolrCmdDistributor.java  |   50 +-
 .../solr/update/StreamingSolrClients.java       |   78 +-
 .../java/org/apache/solr/update/UpdateLog.java  |    2 +-
 .../apache/solr/update/UpdateShardHandler.java  |   92 +-
 .../processor/DistributedUpdateProcessor.java   |   38 +-
 .../processor/TolerantUpdateProcessor.java      |   26 +-
 .../src/java/org/apache/solr/util/TimeOut.java  |    2 +-
 .../stats/InstrumentedHttpListenerFactory.java  |  114 +
 solr/core/src/test-files/log4j2.xml             |    1 +
 .../solr/collection1/conf/schema-bm25.xml       |   17 +
 solr/core/src/test-files/solr/solr.xml          |    2 +-
 .../cloud/AssignBackwardCompatibilityTest.java  |    5 +-
 .../solr/cloud/BasicDistributedZk2Test.java     |   12 +-
 .../org/apache/solr/cloud/CloudTestUtils.java   |    4 +-
 .../solr/cloud/CollectionsAPISolrJTest.java     |    5 +-
 .../apache/solr/cloud/DistributedQueueTest.java |   12 +
 .../solr/cloud/DocValuesNotIndexedTest.java     |   29 +-
 .../apache/solr/cloud/HttpPartitionTest.java    |    2 +-
 .../apache/solr/cloud/KerberosTestServices.java |    3 +-
 .../apache/solr/cloud/MoveReplicaHDFSTest.java  |    5 +
 .../apache/solr/cloud/MultiThreadedOCPTest.java |   11 +-
 ...verseerCollectionConfigSetProcessorTest.java |    4 +-
 .../apache/solr/cloud/RemoteQueryErrorTest.java |    2 +-
 .../org/apache/solr/cloud/SSLMigrationTest.java |    2 +-
 .../solr/cloud/SaslZkACLProviderTest.java       |    3 +-
 .../apache/solr/cloud/TestCloudConsistency.java |    6 +-
 .../solr/cloud/TestMiniSolrCloudClusterSSL.java |   20 +-
 .../apache/solr/cloud/TestSSLRandomization.java |    2 +
 .../cloud/TestSolrCloudWithKerberosAlt.java     |    3 +
 .../CollectionsAPIAsyncDistributedZkTest.java   |    2 +-
 .../CollectionsAPIDistributedZkTest.java        |   16 +-
 .../api/collections/CustomCollectionTest.java   |    2 +
 .../HdfsCollectionsAPIDistributedZkTest.java    |    5 +
 .../AutoAddReplicasPlanActionTest.java          |    2 +-
 .../autoscaling/AutoScalingHandlerTest.java     |    1 +
 .../autoscaling/ExecutePlanActionTest.java      |    9 +-
 .../HdfsAutoAddReplicasIntegrationTest.java     |    4 +
 .../MetricTriggerIntegrationTest.java           |   10 +-
 .../NodeAddedTriggerIntegrationTest.java        |    2 +-
 .../cloud/autoscaling/NodeAddedTriggerTest.java |   18 +-
 .../NodeLostTriggerIntegrationTest.java         |    2 +-
 .../cloud/autoscaling/NodeLostTriggerTest.java  |   18 +-
 .../NodeMarkersRegistrationTest.java            |    3 +
 .../autoscaling/RestoreTriggerStateTest.java    |    3 +-
 .../SearchRateTriggerIntegrationTest.java       |    3 +-
 .../autoscaling/SystemLogListenerTest.java      |   46 +-
 .../TriggerCooldownIntegrationTest.java         |    9 +-
 .../autoscaling/TriggerIntegrationTest.java     |   10 +-
 .../TriggerSetPropertiesIntegrationTest.java    |  250 +-
 .../cloud/autoscaling/sim/SimCloudManager.java  |    3 +-
 .../sim/SimClusterStateProvider.java            |  183 +-
 .../autoscaling/sim/SimDistribStateManager.java |   87 +-
 .../autoscaling/sim/SimSolrCloudTestCase.java   |   39 -
 .../sim/TestSimComputePlanAction.java           |   10 +-
 .../sim/TestSimExecutePlanAction.java           |   20 +-
 .../autoscaling/sim/TestSimExtremeIndexing.java |   20 +-
 .../sim/TestSimGenericDistributedQueue.java     |    1 -
 .../autoscaling/sim/TestSimLargeCluster.java    |   45 +-
 .../sim/TestSimNodeAddedTrigger.java            |   16 +-
 .../autoscaling/sim/TestSimNodeLostTrigger.java |   17 +-
 .../autoscaling/sim/TestSimPolicyCloud.java     |   22 +-
 .../sim/TestSimTriggerIntegration.java          |   59 +-
 .../solr/cloud/cdcr/CdcrBootstrapTest.java      |    2 +-
 .../org/apache/solr/core/TestConfigSets.java    |    2 +-
 .../org/apache/solr/core/TestCoreDiscovery.java |    2 +-
 .../solr/core/TestQuerySenderListener.java      |    8 +-
 .../test/org/apache/solr/core/TestSolrXml.java  |    2 +-
 .../solr/handler/TestReplicationHandler.java    |   33 +-
 .../org/apache/solr/handler/TestSQLHandler.java | 4045 +++++++++---------
 .../handler/component/InfixSuggestersTest.java  |    2 +-
 .../component/TestHttpShardHandlerFactory.java  |    4 +-
 .../metrics/rrd/SolrRrdBackendFactoryTest.java  |   14 +-
 .../solr/response/TestBinaryResponseWriter.java |   45 +-
 .../solr/rest/schema/TestBulkSchemaAPI.java     |    6 +-
 .../search/TestPayloadScoreQParserPlugin.java   |    2 +-
 .../solr/search/function/TestFunctionQuery.java |   10 +-
 .../similarities/TestBM25SimilarityFactory.java |    8 +-
 .../TestLegacyBM25SimilarityFactory.java        |   45 +
 .../TestNonDefinedSimilarityFactory.java        |   28 +-
 .../similarities/TestPerFieldSimilarity.java    |    8 +-
 .../solr/security/BasicAuthIntegrationTest.java |  141 +-
 .../solr/security/BasicAuthStandaloneTest.java  |    4 +-
 .../HttpParamDelegationTokenPlugin.java         |   64 +-
 .../PKIAuthenticationIntegrationTest.java       |   18 +-
 .../security/TestPKIAuthenticationPlugin.java   |   13 +-
 .../TestSolrCloudWithHadoopAuthPlugin.java      |    8 +-
 .../solr/update/MockingHttp2SolrClient.java     |  156 +
 .../org/apache/solr/update/PeerSyncTest.java    |    2 +-
 .../update/TestInPlaceUpdatesStandalone.java    |    2 +-
 .../org/apache/solr/update/UpdateLogTest.java   |    2 +-
 .../ClassificationUpdateProcessorTest.java      |    2 +-
 .../SSLCredentialProviderFactoryTest.java       |   27 +-
 solr/licenses/hamcrest-core-1.3.jar.sha1        |    1 +
 solr/licenses/hamcrest-core-LICENSE-BSD.txt     |   27 +
 solr/licenses/hamcrest-core-NOTICE.txt          |    0
 .../http2-client-9.4.14.v20181114.jar.sha1      |    1 +
 solr/licenses/http2-client-LICENSE-ASL.txt      |  202 +
 solr/licenses/http2-client-NOTICE.txt           |  111 +
 .../http2-common-9.4.14.v20181114.jar.sha1      |    1 +
 solr/licenses/http2-common-LICENSE-ASL.txt      |  202 +
 solr/licenses/http2-common-NOTICE.txt           |  111 +
 .../http2-hpack-9.4.14.v20181114.jar.sha1       |    1 +
 solr/licenses/http2-hpack-LICENSE-ASL.txt       |  202 +
 solr/licenses/http2-hpack-NOTICE.txt            |  111 +
 ...p-client-transport-9.4.14.v20181114.jar.sha1 |    1 +
 .../http2-http-client-transport-LICENSE-ASL.txt |  202 +
 .../http2-http-client-transport-NOTICE.txt      |  111 +
 .../http2-server-9.4.14.v20181114.jar.sha1      |    1 +
 solr/licenses/http2-server-LICENSE-ASL.txt      |  202 +
 solr/licenses/http2-server-NOTICE.txt           |  111 +
 .../jetty-alpn-client-9.4.14.v20181114.jar.sha1 |    1 +
 ...y-alpn-java-client-9.4.14.v20181114.jar.sha1 |    1 +
 ...y-alpn-java-server-9.4.14.v20181114.jar.sha1 |    1 +
 .../jetty-alpn-server-9.4.14.v20181114.jar.sha1 |    1 +
 .../jetty-client-9.4.14.v20181114.jar.sha1      |    1 +
 solr/licenses/junit-4.10.jar.sha1               |    1 -
 solr/licenses/junit-4.12.jar.sha1               |    1 +
 solr/licenses/junit4-ant-2.6.4.jar.sha1         |    1 -
 solr/licenses/junit4-ant-2.7.2.jar.sha1         |    1 +
 .../randomizedtesting-runner-2.6.4.jar.sha1     |    1 -
 .../randomizedtesting-runner-2.7.2.jar.sha1     |    1 +
 solr/licenses/zookeeper-3.4.11.jar.sha1         |    1 -
 solr/licenses/zookeeper-3.4.13.jar.sha1         |    1 +
 solr/server/etc/jetty-http.xml                  |    5 +
 solr/server/etc/jetty-https.xml                 |   26 +-
 solr/server/etc/jetty-https8.xml                |   69 +
 solr/server/ivy.xml                             |    6 +
 solr/server/modules/https8.mod                  |    9 +
 ...uthentication-and-authorization-plugins.adoc |   18 +-
 .../src/basic-authentication-plugin.adoc        |   47 +-
 .../src/distributed-requests.adoc               |    3 -
 solr/solr-ref-guide/src/format-of-solr-xml.adoc |    3 -
 .../src/major-changes-in-solr-8.adoc            |   43 +
 .../src/other-schema-elements.adoc              |    4 +-
 solr/solr-ref-guide/src/using-solrj.adoc        |   10 +-
 solr/solrj/ivy.xml                              |   12 +
 .../apache/solr/client/solrj/SolrRequest.java   |   22 +
 .../solr/client/solrj/embedded/SSLConfig.java   |  166 +
 .../solr/client/solrj/embedded/package.html     |   22 +
 .../impl/ConcurrentUpdateHttp2SolrClient.java   |  690 +++
 .../solr/client/solrj/impl/Http2SolrClient.java |  979 +++++
 .../solrj/impl/HttpClientBuilderFactory.java    |    3 +
 .../client/solrj/impl/HttpListenerFactory.java  |   38 +
 .../solr/client/solrj/impl/HttpSolrClient.java  |   13 +-
 .../solrj/impl/Krb5HttpClientBuilder.java       |   60 +-
 .../client/solrj/impl/LBHttp2SolrClient.java    |   69 +
 .../client/solrj/impl/LBHttpSolrClient.java     |  710 +--
 .../solr/client/solrj/impl/LBSolrClient.java    |  703 +++
 ...PreemptiveBasicAuthClientBuilderFactory.java |   42 +-
 .../client/solrj/io/stream/CloudSolrStream.java |   21 +-
 .../client/solrj/io/stream/FacetStream.java     |   14 +-
 .../client/solrj/io/stream/RandomStream.java    |    3 +-
 .../solrj/io/stream/SearchFacadeStream.java     |    6 +
 .../client/solrj/io/stream/SearchStream.java    |    9 +-
 .../solrj/io/stream/SignificantTermsStream.java |    3 +-
 .../client/solrj/io/stream/StatsStream.java     |    5 +-
 .../solrj/io/stream/TimeSeriesStream.java       |   14 +-
 .../solr/client/solrj/util/Constants.java       |   41 +
 .../solrj/util/SolrBasicAuthentication.java     |   61 +
 .../solr/common/ConditionalMapWriter.java       |    8 +-
 .../apache/solr/common/LinkedHashMapWriter.java |    2 +-
 .../java/org/apache/solr/common/MapWriter.java  |    5 +
 .../org/apache/solr/common/MapWriterMap.java    |    2 +-
 .../org/apache/solr/common/SolrDocument.java    |   18 +-
 .../apache/solr/common/SolrDocumentBase.java    |    2 +-
 .../apache/solr/common/SolrInputDocument.java   |    8 +-
 .../common/util/ByteArrayUtf8CharSequence.java  |   19 +-
 .../solr/common/util/FastOutputStream.java      |    2 +-
 .../apache/solr/common/util/JavaBinCodec.java   |   25 +-
 .../org/apache/solr/common/util/NamedList.java  |    2 +-
 .../solr/common/util/Utf8CharSequence.java      |    2 +-
 solr/solrj/src/test-files/log4j2.xml            |   40 +
 .../solrj/SolrExampleBinaryHttp2Test.java       |   58 +
 .../solr/client/solrj/SolrExampleTests.java     |   10 +-
 .../client/solrj/TestLBHttp2SolrClient.java     |  335 ++
 .../solrj/embedded/SolrExampleJettyTest.java    |   65 +
 .../SolrExampleStreamingBinaryHttp2Test.java    |  103 +
 .../embedded/SolrExampleStreamingHttp2Test.java |  139 +
 .../solrj/embedded/SolrExampleXMLHttp2Test.java |   45 +
 .../solrj/impl/BasicHttpSolrClientTest.java     |    2 +-
 .../solrj/impl/CloudSolrClientBadInputTest.java |    2 +-
 ...urrentUpdateHttp2SolrClientBadInputTest.java |   99 +
 ...pdateHttp2SolrClientMultiCollectionTest.java |   95 +
 .../ConcurrentUpdateHttp2SolrClientTest.java    |  233 +
 .../ConcurrentUpdateSolrClientBadInputTest.java |    4 +-
 .../impl/ConcurrentUpdateSolrClientTest.java    |    9 +-
 .../impl/Http2SolrClientCompatibilityTest.java  |  114 +
 .../client/solrj/impl/Http2SolrClientTest.java  |  598 +++
 .../solrj/impl/HttpSolrClientBadInputTest.java  |    4 +-
 .../impl/HttpSolrClientSSLAuthConPoolTest.java  |    4 +
 .../impl/LBHttpSolrClientBadInputTest.java      |    4 +-
 .../solrj/io/stream/StreamExpressionTest.java   |  174 +
 .../solrj/request/json/DomainMapTest.java       |    2 +-
 .../solrj/request/json/HeatmapFacetMapTest.java |    2 +-
 .../request/json/JsonQueryRequestUnitTest.java  |    2 +-
 .../solrj/request/json/QueryFacetMapTest.java   |    2 +-
 .../solrj/request/json/RangeFacetMapTest.java   |    2 +-
 .../solrj/request/json/TermsFacetMapTest.java   |    2 +-
 solr/test-framework/ivy.xml                     |    5 +-
 .../solr/BaseDistributedSearchTestCase.java     |   17 +-
 .../java/org/apache/solr/SolrJettyTestBase.java |   16 +-
 .../java/org/apache/solr/SolrTestCaseHS.java    |    2 +-
 .../java/org/apache/solr/SolrTestCaseJ4.java    |   11 +-
 .../cloud/AbstractFullDistribZkTestBase.java    |   28 +-
 .../java/org/apache/solr/cloud/ChaosMonkey.java |   41 +-
 .../apache/solr/cloud/MiniSolrCloudCluster.java |   19 +-
 .../solr/cloud/SolrCloudAuthTestCase.java       |  132 +
 .../org/apache/solr/cloud/ZkTestServer.java     |    8 +
 .../component/TrackingShardHandlerFactory.java  |   60 +-
 .../org/apache/solr/util/SSLTestConfig.java     |  146 +-
 solr/webapp/web/WEB-INF/web.xml                 |    2 +-
 solr/webapp/web/css/angular/login.css           |  103 +
 solr/webapp/web/css/angular/menu.css            |    2 +
 solr/webapp/web/index.html                      |  160 +-
 solr/webapp/web/js/angular/app.js               |   47 +-
 solr/webapp/web/js/angular/controllers/login.js |  146 +
 solr/webapp/web/js/angular/controllers/query.js |    3 +-
 solr/webapp/web/js/angular/services.js          |   26 +-
 solr/webapp/web/libs/angular-utf8-base64.js     |  217 +
 solr/webapp/web/libs/angular-utf8-base64.min.js |   45 +
 solr/webapp/web/partials/login.html             |   80 +
 365 files changed, 15337 insertions(+), 7492 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/010ca9e5/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java
----------------------------------------------------------------------