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 2019/02/20 19:28:14 UTC
[lucene-solr] 01/03: Merge branch 'master' into jira/solr-11127
This is an automated email from the ASF dual-hosted git repository.
ab pushed a commit to branch jira/solr-11127
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit 70a01fa327d7a2e7c0053f813f0a9897acaf9dbc
Merge: 800cd70 242ff88
Author: Andrzej Bialecki <ab...@apache.org>
AuthorDate: Tue Feb 12 12:40:49 2019 +0100
Merge branch 'master' into jira/solr-11127
dev-tools/doap/lucene.rdf | 7 +
dev-tools/doap/solr.rdf | 7 +
.../maven/solr/core/src/test/pom.xml.template | 1 +
dev-tools/scripts/buildAndPushRelease.py | 2 +-
lucene/CHANGES.txt | 29 +
lucene/MIGRATE.txt | 7 +
.../apache/lucene/analysis/ko/KoreanTokenizer.java | 2 +-
.../codecs/lucene70/Lucene70DocValuesProducer.java | 5 +
.../lucene/codecs/blockterms/BlockTermsReader.java | 5 +
.../lucene/codecs/memory/DirectPostingsFormat.java | 5 +
.../lucene/codecs/memory/FSTOrdTermsReader.java | 5 +
.../lucene/codecs/memory/FSTTermsReader.java | 5 +
.../codecs/simpletext/SimpleTextBKDWriter.java | 521 ++----
.../codecs/simpletext/SimpleTextPointsWriter.java | 4 +-
.../simpletext/SimpleTextTermVectorsReader.java | 5 +
.../compressing/CompressingTermVectorsReader.java | 5 +
.../codecs/lucene60/Lucene60PointsWriter.java | 10 +-
.../codecs/lucene80/Lucene80DocValuesProducer.java | 5 +
.../src/java/org/apache/lucene/geo/EdgeTree.java | 85 +-
.../src/java/org/apache/lucene/geo/GeoUtils.java | 23 +-
.../src/java/org/apache/lucene/geo/Polygon2D.java | 49 +-
.../org/apache/lucene/index/FilterLeafReader.java | 5 +
.../org/apache/lucene/index/FreqProxFields.java | 5 +
.../java/org/apache/lucene/index/TermsEnum.java | 25 +-
.../java/org/apache/lucene/search/TotalHits.java | 17 +
.../apache/lucene/store/NRTCachingDirectory.java | 2 +-
.../src/java/org/apache/lucene/util/Version.java | 7 +
.../apache/lucene/util/bkd/BKDRadixSelector.java | 386 +++++
.../java/org/apache/lucene/util/bkd/BKDWriter.java | 627 ++------
.../apache/lucene/util/bkd/HeapPointReader.java | 53 +-
.../apache/lucene/util/bkd/HeapPointWriter.java | 118 +-
.../apache/lucene/util/bkd/OfflinePointReader.java | 211 +--
.../apache/lucene/util/bkd/OfflinePointWriter.java | 81 +-
.../org/apache/lucene/util/bkd/PointReader.java | 50 +-
.../org/apache/lucene/util/bkd/PointWriter.java | 18 +-
.../test/org/apache/lucene/index/TestCodecs.java | 5 +
.../org/apache/lucene/search/TestSynonymQuery.java | 3 +-
.../apache/lucene/search/TestTopDocsCollector.java | 2 +-
.../org/apache/lucene/search/TestTopDocsMerge.java | 12 +-
.../lucene/search/TestTopFieldCollector.java | 12 +-
.../org/apache/lucene/search/TestTotalHits.java | 56 +
.../apache/lucene/util/bkd/Test2BBKDPoints.java | 4 +-
.../test/org/apache/lucene/util/bkd/TestBKD.java | 30 +-
.../lucene/util/bkd/TestBKDRadixSelector.java | 317 ++++
lucene/ivy-versions.properties | 85 +-
.../queries/function/FunctionScoreQuery.java | 7 +
.../queries/function/TestFunctionScoreQuery.java | 24 +
.../src/java/org/apache/lucene/geo/Line2D.java | 15 +
.../apache/lucene/document/TestLatLonShape.java | 133 ++
.../org/apache/lucene/search/TestBM25FQuery.java | 3 +-
.../codecs/ramonly/RAMOnlyPostingsFormat.java | 5 +
.../java/org/apache/lucene/index/RandomCodec.java | 10 +-
.../apache/lucene/index/RandomPostingsTester.java | 5 +
.../tools/src/groovy/check-source-patterns.groovy | 1 +
solr/CHANGES.txt | 57 +-
solr/bin/solr | 19 +-
solr/core/build.xml | 1 +
solr/core/ivy.xml | 93 +-
.../java/org/apache/solr/cloud/ZkController.java | 4 +-
.../src/java/org/apache/solr/core/SolrCore.java | 6 +
.../java/org/apache/solr/handler/IndexFetcher.java | 108 +-
.../apache/solr/handler/ReplicationHandler.java | 9 +
.../apache/solr/request/SolrQueryRequestBase.java | 32 +-
.../org/apache/solr/search/facet/FacetModule.java | 8 +-
.../apache/solr/search/facet/FacetProcessor.java | 39 +-
.../org/apache/solr/search/facet/FacetRange.java | 29 +-
.../org/apache/solr/search/facet/FacetRequest.java | 92 +-
.../org/apache/solr/uninverting/DocTermOrds.java | 5 +
.../apache/solr/update/DefaultSolrCoreState.java | 6 +-
.../processor/DistributedUpdateProcessor.java | 9 +-
.../src/java/org/apache/solr/util/FSHDFSUtils.java | 3 +-
.../java/org/apache/solr/util/RedactionUtils.java | 29 +
.../src/java/org/apache/solr/util/SolrCLI.java | 297 ++++
.../datanode/fsdataset/impl/BlockPoolSlice.java | 1044 ++++++++++++
.../test/org/apache/hadoop/http/HttpServer2.java | 1685 ++++++++++++++++++++
.../apache/solr/cloud/LeaderTragicEventTest.java | 3 +-
.../solr/cloud/RestartWhileUpdatingTest.java | 7 +-
.../solr/cloud/TestSolrCloudWithKerberosAlt.java | 12 -
.../cloud/TestStressCloudBlindAtomicUpdates.java | 25 +-
.../solr/cloud/TriLevelCompositeIdRoutingTest.java | 166 +-
.../org/apache/solr/cloud/hdfs/HdfsTestUtil.java | 166 +-
.../solr/handler/TestReplicationHandler.java | 10 +-
.../TestReplicationHandlerDiskOverFlow.java | 190 +++
.../solr/handler/export/TestExportWriter.java | 2 +-
.../solr/response/TestCustomDocTransformer.java | 3 +-
.../apache/solr/search/facet/TestJsonFacets.java | 115 +-
.../apache/solr/security/JWTAuthPluginTest.java | 5 +-
.../hadoop/TestSolrCloudWithHadoopAuthPlugin.java | 3 -
.../security/hadoop/TestZkAclsWithHadoopAuth.java | 1 -
.../apache/solr/store/hdfs/HdfsDirectoryTest.java | 2 +-
.../org/apache/solr/util/OrderedExecutorTest.java | 159 +-
solr/licenses/antlr-2.7.7.jar.sha1 | 1 -
solr/licenses/antlr-LICENSE-PD.txt | 31 -
solr/licenses/antlr-NOTICE.txt | 1 -
solr/licenses/apacheds-core-2.0.0-M15.jar.sha1 | 1 -
solr/licenses/apacheds-core-NOTICE.txt | 23 -
solr/licenses/apacheds-core-api-2.0.0-M15.jar.sha1 | 1 -
solr/licenses/apacheds-core-api-NOTICE.txt | 23 -
solr/licenses/apacheds-core-avl-2.0.0-M15.jar.sha1 | 1 -
solr/licenses/apacheds-core-avl-NOTICE.txt | 23 -
.../apacheds-core-shared-2.0.0-M15.jar.sha1 | 1 -
solr/licenses/apacheds-core-shared-NOTICE.txt | 23 -
solr/licenses/apacheds-i18n-2.0.0-M15.jar.sha1 | 1 -
solr/licenses/apacheds-i18n-LICENSE-ASL.txt | 341 ----
solr/licenses/apacheds-i18n-NOTICE.txt | 23 -
...pacheds-interceptor-kerberos-2.0.0-M15.jar.sha1 | 1 -
.../apacheds-interceptor-kerberos-LICENSE-ASL.txt | 341 ----
.../apacheds-interceptor-kerberos-NOTICE.txt | 23 -
.../apacheds-interceptors-admin-2.0.0-M15.jar.sha1 | 1 -
.../apacheds-interceptors-admin-LICENSE-ASL.txt | 341 ----
.../apacheds-interceptors-admin-NOTICE.txt | 23 -
.../apacheds-interceptors-authn-2.0.0-M15.jar.sha1 | 1 -
.../apacheds-interceptors-authn-LICENSE-ASL.txt | 341 ----
.../apacheds-interceptors-authn-NOTICE.txt | 23 -
.../apacheds-interceptors-authz-2.0.0-M15.jar.sha1 | 1 -
.../apacheds-interceptors-authz-LICENSE-ASL.txt | 341 ----
.../apacheds-interceptors-authz-NOTICE.txt | 23 -
...cheds-interceptors-changelog-2.0.0-M15.jar.sha1 | 1 -
...apacheds-interceptors-changelog-LICENSE-ASL.txt | 341 ----
.../apacheds-interceptors-changelog-NOTICE.txt | 23 -
...heds-interceptors-collective-2.0.0-M15.jar.sha1 | 1 -
...pacheds-interceptors-collective-LICENSE-ASL.txt | 341 ----
.../apacheds-interceptors-collective-NOTICE.txt | 23 -
.../apacheds-interceptors-event-2.0.0-M15.jar.sha1 | 1 -
.../apacheds-interceptors-event-LICENSE-ASL.txt | 341 ----
.../apacheds-interceptors-event-NOTICE.txt | 23 -
...cheds-interceptors-exception-2.0.0-M15.jar.sha1 | 1 -
...apacheds-interceptors-exception-LICENSE-ASL.txt | 341 ----
.../apacheds-interceptors-exception-NOTICE.txt | 23 -
...pacheds-interceptors-journal-2.0.0-M15.jar.sha1 | 1 -
.../apacheds-interceptors-journal-LICENSE-ASL.txt | 341 ----
.../apacheds-interceptors-journal-NOTICE.txt | 23 -
...s-interceptors-normalization-2.0.0-M15.jar.sha1 | 1 -
...heds-interceptors-normalization-LICENSE-ASL.txt | 341 ----
.../apacheds-interceptors-normalization-NOTICE.txt | 23 -
...eds-interceptors-operational-2.0.0-M15.jar.sha1 | 1 -
...acheds-interceptors-operational-LICENSE-ASL.txt | 341 ----
.../apacheds-interceptors-operational-NOTICE.txt | 23 -
...acheds-interceptors-referral-2.0.0-M15.jar.sha1 | 1 -
.../apacheds-interceptors-referral-LICENSE-ASL.txt | 341 ----
.../apacheds-interceptors-referral-NOTICE.txt | 23 -
...apacheds-interceptors-schema-2.0.0-M15.jar.sha1 | 1 -
.../apacheds-interceptors-schema-LICENSE-ASL.txt | 341 ----
.../apacheds-interceptors-schema-NOTICE.txt | 23 -
...pacheds-interceptors-subtree-2.0.0-M15.jar.sha1 | 1 -
.../apacheds-interceptors-subtree-LICENSE-ASL.txt | 341 ----
.../apacheds-interceptors-subtree-NOTICE.txt | 23 -
...pacheds-interceptors-trigger-2.0.0-M15.jar.sha1 | 1 -
.../apacheds-interceptors-trigger-LICENSE-ASL.txt | 341 ----
.../apacheds-interceptors-trigger-NOTICE.txt | 23 -
.../apacheds-jdbm-partition-2.0.0-M15.jar.sha1 | 1 -
.../apacheds-jdbm-partition-LICENSE-ASL.txt | 341 ----
solr/licenses/apacheds-jdbm-partition-NOTICE.txt | 23 -
solr/licenses/apacheds-jdbm1-2.0.0-M2.jar.sha1 | 1 -
solr/licenses/apacheds-jdbm1-LICENSE-ASL.txt | 341 ----
solr/licenses/apacheds-jdbm1-NOTICE.txt | 23 -
.../apacheds-kerberos-codec-2.0.0-M15.jar.sha1 | 1 -
.../apacheds-kerberos-codec-LICENSE-ASL.txt | 341 ----
solr/licenses/apacheds-kerberos-codec-NOTICE.txt | 23 -
.../apacheds-ldif-partition-2.0.0-M15.jar.sha1 | 1 -
.../apacheds-ldif-partition-LICENSE-ASL.txt | 341 ----
solr/licenses/apacheds-ldif-partition-NOTICE.txt | 23 -
.../apacheds-mavibot-partition-2.0.0-M15.jar.sha1 | 1 -
.../apacheds-mavibot-partition-LICENSE-ASL.txt | 341 ----
.../licenses/apacheds-mavibot-partition-NOTICE.txt | 23 -
.../apacheds-protocol-kerberos-2.0.0-M15.jar.sha1 | 1 -
.../apacheds-protocol-kerberos-LICENSE-ASL.txt | 341 ----
.../licenses/apacheds-protocol-kerberos-NOTICE.txt | 23 -
.../apacheds-protocol-ldap-2.0.0-M15.jar.sha1 | 1 -
.../apacheds-protocol-ldap-LICENSE-ASL.txt | 341 ----
solr/licenses/apacheds-protocol-ldap-NOTICE.txt | 23 -
.../apacheds-protocol-shared-2.0.0-M15.jar.sha1 | 1 -
.../apacheds-protocol-shared-LICENSE-ASL.txt | 341 ----
solr/licenses/apacheds-protocol-shared-NOTICE.txt | 23 -
.../apacheds-xdbm-partition-2.0.0-M15.jar.sha1 | 1 -
.../apacheds-xdbm-partition-LICENSE-ASL.txt | 341 ----
solr/licenses/apacheds-xdbm-partition-NOTICE.txt | 23 -
solr/licenses/api-all-1.0.0-M20.jar.sha1 | 1 -
solr/licenses/api-all-LICENSE-ASL.txt | 341 ----
solr/licenses/api-all-NOTICE.txt | 23 -
solr/licenses/commons-beanutils-1.9.3.jar.sha1 | 1 +
...E-ASL.txt => commons-beanutils-LICENSE-ASL.txt} | 139 --
solr/licenses/commons-beanutils-NOTICE.txt | 5 +
solr/licenses/commons-configuration-1.6.jar.sha1 | 1 -
.../licenses/commons-configuration2-2.1.1.jar.sha1 | 1 +
....txt => commons-configuration2-LICENSE-ASL.txt} | 231 ++-
solr/licenses/commons-configuration2-NOTICE.txt | 5 +
solr/licenses/commons-lang3-3.6.jar.sha1 | 1 -
solr/licenses/commons-lang3-3.8.1.jar.sha1 | 1 +
solr/licenses/commons-logging-1.1.3.jar.sha1 | 1 +
...NSE-ASL.txt => commons-logging-LICENSE-ASL.txt} | 30 +-
solr/licenses/commons-logging-NOTICE.txt | 5 +
solr/licenses/commons-text-1.4.jar.sha1 | 1 +
...ICENSE-ASL.txt => commons-text-LICENSE-ASL.txt} | 139 --
solr/licenses/commons-text-NOTICE.txt | 5 +
solr/licenses/ehcache-core-2.4.4.jar.sha1 | 1 -
solr/licenses/ehcache-core-LICENSE-ASL.txt | 15 -
solr/licenses/ehcache-core-NOTICE.txt | 0
solr/licenses/hadoop-annotations-2.7.4.jar.sha1 | 1 -
solr/licenses/hadoop-annotations-3.2.0.jar.sha1 | 1 +
solr/licenses/hadoop-auth-2.7.4.jar.sha1 | 1 -
solr/licenses/hadoop-auth-3.2.0.jar.sha1 | 1 +
solr/licenses/hadoop-common-2.7.4-tests.jar.sha1 | 1 -
solr/licenses/hadoop-common-2.7.4.jar.sha1 | 1 -
solr/licenses/hadoop-common-3.2.0-tests.jar.sha1 | 1 +
solr/licenses/hadoop-common-3.2.0.jar.sha1 | 1 +
solr/licenses/hadoop-hdfs-2.7.4-tests.jar.sha1 | 1 -
solr/licenses/hadoop-hdfs-2.7.4.jar.sha1 | 1 -
solr/licenses/hadoop-hdfs-3.2.0-tests.jar.sha1 | 1 +
solr/licenses/hadoop-hdfs-3.2.0.jar.sha1 | 1 +
solr/licenses/hadoop-hdfs-client-3.2.0.jar.sha1 | 1 +
...-ASL.txt => hadoop-hdfs-client-LICENSE-ASL.txt} | 177 +-
solr/licenses/hadoop-hdfs-client-NOTICE.txt | 2 +
solr/licenses/hadoop-minicluster-3.2.0.jar.sha1 | 1 +
...-ASL.txt => hadoop-minicluster-LICENSE-ASL.txt} | 177 +-
solr/licenses/hadoop-minicluster-NOTICE.txt | 2 +
solr/licenses/hadoop-minikdc-2.7.4.jar.sha1 | 1 -
solr/licenses/hadoop-minikdc-3.2.0.jar.sha1 | 1 +
.../licenses/htrace-core-3.2.0-incubating.jar.sha1 | 1 -
.../htrace-core4-4.1.0-incubating.jar.sha1 | 1 +
...ICENSE-ASL.txt => htrace-core4-LICENSE-ASL.txt} | 0
...ace-core-NOTICE.txt => htrace-core4-NOTICE.txt} | 0
solr/licenses/jackson-core-asl-1.9.13.jar.sha1 | 1 -
solr/licenses/jackson-mapper-asl-1.9.13.jar.sha1 | 1 -
solr/licenses/jersey-core-1.19.jar.sha1 | 1 +
solr/licenses/jersey-core-1.9.jar.sha1 | 1 -
solr/licenses/jersey-server-1.19.jar.sha1 | 1 +
solr/licenses/jersey-server-1.9.jar.sha1 | 1 -
solr/licenses/jersey-servlet-1.19.jar.sha1 | 1 +
solr/licenses/jersey-servlet-LICENSE-CDDL.txt | 85 +
solr/licenses/jetty-6.1.26.jar.sha1 | 1 -
solr/licenses/jetty-sslengine-6.1.26.jar.sha1 | 1 -
solr/licenses/jetty-util-6.1.26.jar.sha1 | 1 -
solr/licenses/kerb-admin-1.0.1.jar.sha1 | 1 +
...-LICENSE-ASL.txt => kerb-admin-LICENSE-ASL.txt} | 31 +-
solr/licenses/kerb-admin-NOTICE.txt | 5 +
solr/licenses/kerb-client-1.0.1.jar.sha1 | 1 +
...LICENSE-ASL.txt => kerb-client-LICENSE-ASL.txt} | 31 +-
solr/licenses/kerb-client-NOTICE.txt | 5 +
solr/licenses/kerb-common-1.0.1.jar.sha1 | 1 +
...LICENSE-ASL.txt => kerb-common-LICENSE-ASL.txt} | 31 +-
solr/licenses/kerb-common-NOTICE.txt | 5 +
solr/licenses/kerb-core-1.0.1.jar.sha1 | 1 +
...e-LICENSE-ASL.txt => kerb-core-LICENSE-ASL.txt} | 31 +-
solr/licenses/kerb-core-NOTICE.txt | 5 +
solr/licenses/kerb-crypto-1.0.1.jar.sha1 | 1 +
...LICENSE-ASL.txt => kerb-crypto-LICENSE-ASL.txt} | 31 +-
solr/licenses/kerb-crypto-NOTICE.txt | 5 +
solr/licenses/kerb-identity-1.0.1.jar.sha1 | 1 +
...CENSE-ASL.txt => kerb-identity-LICENSE-ASL.txt} | 31 +-
solr/licenses/kerb-identity-NOTICE.txt | 5 +
solr/licenses/kerb-server-1.0.1.jar.sha1 | 1 +
...LICENSE-ASL.txt => kerb-server-LICENSE-ASL.txt} | 31 +-
solr/licenses/kerb-server-NOTICE.txt | 5 +
solr/licenses/kerb-simplekdc-1.0.1.jar.sha1 | 1 +
...ENSE-ASL.txt => kerb-simplekdc-LICENSE-ASL.txt} | 31 +-
solr/licenses/kerb-simplekdc-NOTICE.txt | 5 +
solr/licenses/kerb-util-1.0.1.jar.sha1 | 1 +
...e-LICENSE-ASL.txt => kerb-util-LICENSE-ASL.txt} | 31 +-
solr/licenses/kerb-util-NOTICE.txt | 5 +
solr/licenses/kerby-asn1-1.0.1.jar.sha1 | 1 +
...-LICENSE-ASL.txt => kerby-asn1-LICENSE-ASL.txt} | 31 +-
solr/licenses/kerby-asn1-NOTICE.txt | 5 +
solr/licenses/kerby-config-1.0.1.jar.sha1 | 1 +
...ICENSE-ASL.txt => kerby-config-LICENSE-ASL.txt} | 31 +-
solr/licenses/kerby-config-NOTICE.txt | 5 +
solr/licenses/kerby-kdc-1.0.1.jar.sha1 | 1 +
...e-LICENSE-ASL.txt => kerby-kdc-LICENSE-ASL.txt} | 31 +-
solr/licenses/kerby-kdc-NOTICE.txt | 5 +
solr/licenses/kerby-pkix-1.0.1.jar.sha1 | 1 +
...-LICENSE-ASL.txt => kerby-pkix-LICENSE-ASL.txt} | 31 +-
solr/licenses/kerby-pkix-NOTICE.txt | 5 +
solr/licenses/kerby-util-1.0.1.jar.sha1 | 1 +
...-LICENSE-ASL.txt => kerby-util-LICENSE-ASL.txt} | 31 +-
solr/licenses/kerby-util-NOTICE.txt | 5 +
solr/licenses/mina-core-2.0.0-M5.jar.sha1 | 1 -
solr/licenses/netty-all-4.0.36.Final.jar.sha1 | 1 -
solr/licenses/netty-all-4.0.52.Final.jar.sha1 | 1 +
solr/licenses/netty-all-NOTICE.txt | 140 +-
solr/licenses/protobuf-java-3.1.0.jar.sha1 | 1 -
solr/licenses/protobuf-java-3.6.1.jar.sha1 | 1 +
solr/licenses/re2j-1.2.jar.sha1 | 1 +
solr/licenses/re2j-LICENSE-BSD_LIKE.txt | 33 +
solr/licenses/re2j-NOTICE.txt | 5 +
solr/solr-ref-guide/src/blockjoin-faceting.adoc | 2 +-
solr/solr-ref-guide/src/collections-api.adoc | 14 +-
solr/solr-ref-guide/src/config-sets.adoc | 2 +-
solr/solr-ref-guide/src/configsets-api.adoc | 2 +-
.../src/configuring-solrconfig-xml.adoc | 4 +-
solr/solr-ref-guide/src/coreadmin-api.adoc | 2 +-
...datadir-and-directoryfactory-in-solrconfig.adoc | 2 +-
solr/solr-ref-guide/src/docvalues.adoc | 2 +-
solr/solr-ref-guide/src/function-queries.adoc | 2 +-
.../src/implicit-requesthandlers.adoc | 2 +-
solr/solr-ref-guide/src/json-facet-api.adoc | 781 +++++----
.../src/json-faceting-domain-changes.adoc | 256 +++
solr/solr-ref-guide/src/json-query-dsl.adoc | 346 +++-
solr/solr-ref-guide/src/json-request-api.adoc | 218 ++-
solr/solr-ref-guide/src/language-analysis.adoc | 30 +-
.../src/major-changes-in-solr-7.adoc | 2 +-
.../src/making-and-restoring-backups.adoc | 2 +-
.../src/query-settings-in-solrconfig.adoc | 2 +-
.../solr-ref-guide/src/request-parameters-api.adoc | 4 +-
solr/solr-ref-guide/src/response-writers.adoc | 2 +-
solr/solr-ref-guide/src/schemaless-mode.adoc | 4 +-
.../src/solr-control-script-reference.adoc | 2 +-
solr/solr-ref-guide/src/solr-tutorial.adoc | 4 +-
.../src/solrcloud-autoscaling-listeners.adoc | 2 +-
.../src/solrcloud-autoscaling-triggers.adoc | 2 +-
.../src/stream-decorator-reference.adoc | 2 +-
.../src/stream-source-reference.adoc | 4 +-
.../src/the-extended-dismax-query-parser.adoc | 2 +-
.../src/uploading-data-with-index-handlers.adoc | 9 +-
solr/solr-ref-guide/src/v2-api.adoc | 4 +-
solr/solr-ref-guide/src/velocity-search-ui.adoc | 2 +-
.../src/zookeeper-access-control.adoc | 2 +-
.../org/apache/solr/client/solrj/SolrClient.java | 38 +-
.../solr/client/solrj/cloud/autoscaling/Row.java | 4 +
.../JsonRequestApiHeatmapFacetingTest.java | 108 ++
.../ref_guide_examples/JsonRequestApiTest.java | 563 ++++++-
.../org/apache/solr/util/BadHdfsThreadsFilter.java | 6 +-
321 files changed, 8579 insertions(+), 12795 deletions(-)