Apache Solr open-source search software
SOLR-14380: Fix "the the" pattern through our codebase. (#3798)
Eric Pugh6d52d5fbf2fd
diff --git a/dev-docs/asf-jenkins.adoc b/dev-docs/asf-jenkins.adocindex b3c59b6fd9e..62cc39053a5 100644--- a/dev-docs/asf-jenkins.adoc+++ b/dev-docs/asf-jenkins.adoc@@ -36,7 +36,7 @@ That is: they are VMs requested by a project for their exclusive use.Maintenance of these agent VMs falls into a bit of a gray area.INFRA will still intervene when asked: to reboot nodes, to deploy OS upgrades, etc.-But some burden also falls on Lucene and Solr as project teams to monitor the the VMs and keep them healthy.+But some burden also falls on Lucene and Solr as project teams to monitor the VMs and keep them healthy.=== Accessing Jenkins Agentsdiff --git a/dev-docs/ref-guide/asciidoc-syntax.adoc b/dev-docs/ref-guide/asciidoc-syntax.adocindex 5f32b895409..510bea5aec7 100644--- a/dev-docs/ref-guide/asciidoc-syntax.adoc+++ b/dev-docs/ref-guide/asciidoc-syntax.adoc@@ -196,7 +196,7 @@ To link to this section from another part of the same `defining-fields.adoc` pag[source]See also the <<Field Properties>> section.+-The section title will be used as the display text; to customize that add a comma after the the section title, then the text you want used for display.+The section title will be used as the display text; to customize that add a comma after the section title, then the text you want used for display.More info: https://docs.asciidoctor.org/asciidoc/latest/macros/xref/#internal-cross-referencesdiff --git a/dev-tools/scripts/releaseWizard.yaml b/dev-tools/scripts/releaseWizard.yamlindex a5493e6ddea..41d3eb05ae2 100644--- a/dev-tools/scripts/releaseWizard.yaml+++ b/dev-tools/scripts/releaseWizard.yaml@@ -1321,7 +1321,7 @@ groups:description: |Ensure that the reference Guide is updated for {{ release_version }}. In particular, the sections "Solr Upgrade Notes"and (if applicable) also the "Major changes in Solr ..." section must be up to date for the latest release.- Check that the the Blocker JIRA issue created in the beginning of the release process is resolved.+ Check that the Blocker JIRA issue created in the beginning of the release process is resolved.- !Todoid: build_ref_guide_htaccesstitle: Build the ref guide .htaccess filediff --git a/solr/CHANGES.txt b/solr/CHANGES.txtindex 99b9bd84db4..7b0393fd50e 100644--- a/solr/CHANGES.txt+++ b/solr/CHANGES.txt@@ -3910,7 +3910,7 @@ Improvements* SOLR-8673: Make JSON Facets extendable (Tim Owen via Mikhail Khludnev)* SOLR-14965: metrics: Adds two metrics to the SolrCloud Overseer: solr_metrics_overseer_stateUpdateQueueSize- and solr_metrics_overseer_collectionWorkQueueSize with corresponding entries in the the Prometheus exporter's+ and solr_metrics_overseer_collectionWorkQueueSize with corresponding entries in the Prometheus exporter'sdefault/stock configuration. (Saatchi Bhalla, Megan Carey, Andrzej Białecki, David Smiley)* SOLR-14827: Refactor schema loading to not use XPath (noble)@@ -5458,7 +5458,7 @@ Improvementsnodes instead of using them directly at the toplevel (noble)* SOLR-13329: In autoscaling policies, use an explicit 'put : on-each-node'- to specify the the rules is applied on each node (noble)+ to specify the rules is applied on each node (noble)* SOLR-13347: Transaction log to natively support UUID types (Thomas Wöckinger via noble)@@ -23418,7 +23418,7 @@ This problem is corrected in Solr 1.3, but DateField users that mighthave been affected by indexing inconsistent formats of equivalentdates (ie: 1995-12-31T23:59:59Z vs 1995-12-31T23:59:59.000Z) may wantto consider reindexing to correct these inconsistencies. Users who-depend on some of the the "broken" behavior of DateField in Solr 1.2+depend on some of the "broken" behavior of DateField in Solr 1.2(specificly: accepting any input that ends in a 'Z') should considerusing the LegacyDateField class as a possible alternative. Users thatdesire 100% backwards compatibility should consider using the Solr 1.2@@ -24388,7 +24388,7 @@ Bug Fixespossible for path based request handlers. (ryan)14. SOLR-214: Some servlet containers (including Tomcat and Resin) do not- obey the specified charset. Rather then letting the the container handle+ obey the specified charset. Rather than letting the container handleit solr now uses the charset from the header contentType to decode postedcontent. Using the contentType: "text/xml; charset=utf-8" will forceutf-8 encoding. If you do not specify a contentType, it will use thediff --git a/solr/core/src/java/org/apache/solr/handler/admin/HealthCheckHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/HealthCheckHandler.javaindex b174e177f1a..1ecf959e49e 100644--- a/solr/core/src/java/org/apache/solr/handler/admin/HealthCheckHandler.java+++ b/solr/core/src/java/org/apache/solr/handler/admin/HealthCheckHandler.java@@ -260,7 +260,7 @@ public class HealthCheckHandler extends RequestHandlerBase {// are// 1) commit generation rolls over Long.MAX_VALUE (really unlikely)// 2) Leader's index is wiped clean and the follower is still showing commit generation- // from the the old index+ // from the old indexif (generationDiff < 0) {log.warn("core:[{}], generation lag:[{}] is negative.");} else if (generationDiff < maxGenerationLag) {diff --git a/solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.javaindex 5840371b18d..e3d07b1cbca 100644--- a/solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java+++ b/solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java@@ -666,8 +666,8 @@ public class LukeRequestHandler extends RequestHandlerBase {}/**- * A helper method that attempts to determine the file length of the the segments file for the- * specified IndexCommit from it's Directory.+ * A helper method that attempts to determine the file length of the segments file for the+ * specified IndexCommit from its Directory.** <p>If any sort of {@link IOException} occurs, this method will return "-1" and swallow the* exception since this may be normal if the IndexCommit is no longer "on disk". The specific typediff --git a/solr/core/src/java/org/apache/solr/schema/CurrencyFieldType.java b/solr/core/src/java/org/apache/solr/schema/CurrencyFieldType.javaindex 54b00a5d12d..375d3804db1 100644--- a/solr/core/src/java/org/apache/solr/schema/CurrencyFieldType.java+++ b/solr/core/src/java/org/apache/solr/schema/CurrencyFieldType.java@@ -300,8 +300,8 @@ public class CurrencyFieldType extends FieldType implements SchemaAware, Resourc* values returned by this value source would represent the equivalent number of "cents" (ie:* value in dollars * 100) after converting each document's native currency to USD -- because the* default fractional digits for <code>USD</code> is "<code>2</code>". So for a document whose- * indexed value was currently equivalent to "<code>5.43,USD</code>" using the the exchange- * provider for this field, this ValueSource would return a value of "<code>543</code>"+ * indexed value was currently equivalent to "<code>5.43,USD</code>" using the exchange provider+ * for this field, this ValueSource would return a value of "<code>543</code>"** @see #PARAM_DEFAULT_CURRENCY* @see #DEFAULT_DEFAULT_CURRENCY@@ -323,8 +323,8 @@ public class CurrencyFieldType extends FieldType implements SchemaAware, Resourc* <p>For example: If the <code>targetCurrencyCode</code> param is set to <code>USD</code>, then* the values returned by this value source would represent the equivalent number of dollars after* converting each document's raw value to <code>USD</code>. So for a document whose indexed value- * was currently equivalent to "<code>5.43,USD</code>" using the the exchange provider for this- * field, this ValueSource would return a value of "<code>5.43</code>"+ * was currently equivalent to "<code>5.43,USD</code>" using the exchange provider for this field,+ * this ValueSource would return a value of "<code>5.43</code>"** @param targetCurrencyCode The target currency for the resulting value source, if null the* defaultCurrency for this field type will be useddiff --git a/solr/core/src/java/org/apache/solr/schema/IndexSchema.java b/solr/core/src/java/org/apache/solr/schema/IndexSchema.javaindex 832742e17fa..3372bcae065 100644--- a/solr/core/src/java/org/apache/solr/schema/IndexSchema.java+++ b/solr/core/src/java/org/apache/solr/schema/IndexSchema.java@@ -1311,7 +1311,7 @@ public class IndexSchema {/*** Generates a destination field name based on this source pattern, by substituting the- * remainder of this source pattern into the the given destination pattern.+ * remainder of this source pattern into the given destination pattern.*/public SchemaField getTargetField(String sourceField) {String remainder = pattern.remainder(sourceField);diff --git a/solr/core/src/java/org/apache/solr/search/CollapsingQParserPlugin.java b/solr/core/src/java/org/apache/solr/search/CollapsingQParserPlugin.javaindex 9e5503f4fd8..d85932bb3ed 100644--- a/solr/core/src/java/org/apache/solr/search/CollapsingQParserPlugin.java+++ b/solr/core/src/java/org/apache/solr/search/CollapsingQParserPlugin.java@@ -3567,8 +3567,8 @@ public class CollapsingQParserPlugin extends QParserPlugin {private final Object[] nullGroupValues;/**- * Constructs an instance based on the the (raw, un-rewritten) SortFields to be used, and an- * initial number of expected groups (will grow as needed).+ * Constructs an instance based on the (raw, un-rewritten) SortFields to be used, and an initial+ * number of expected groups (will grow as needed).*/@SuppressWarnings({"rawtypes"})public SortFieldsCompare(SortField[] sorts, int initNumGroups) {diff --git a/solr/core/src/java/org/apache/solr/search/facet/FacetRequestSortedMerger.java b/solr/core/src/java/org/apache/solr/search/facet/FacetRequestSortedMerger.javaindex e5176c6e2af..45e7427eedb 100644--- a/solr/core/src/java/org/apache/solr/search/facet/FacetRequestSortedMerger.java+++ b/solr/core/src/java/org/apache/solr/search/facet/FacetRequestSortedMerger.java@@ -237,7 +237,7 @@ abstract class FacetRequestSortedMerger<FacetRequestT extends FacetRequestSorted// Perhaps that would make more sense in the 'overrequest' heuristic calc?//// Maybe we should look at how many buckets were fully populated in phase#1 AND- // already meet the 'mincount', and use the the difference between that number+ // already meet the 'mincount', and use the difference between that number// and 'limit' to decide a scaling factor for 'overrefine' ?} else { // user requested an explicit amount of overrefinementdiff --git a/solr/core/src/java/org/apache/solr/search/facet/SweepCountAware.java b/solr/core/src/java/org/apache/solr/search/facet/SweepCountAware.javaindex 8dba7fa8595..fe9e5ee6e11 100644--- a/solr/core/src/java/org/apache/solr/search/facet/SweepCountAware.java+++ b/solr/core/src/java/org/apache/solr/search/facet/SweepCountAware.java@@ -162,8 +162,8 @@ interface SweepCountAware {/*** Maps accumulated per-segment term ords to global term ords and increments global slots on the* specified countAccs accordingly. The index of each CountSlotAcc in the specified countAccs- * array must correspond to the the static index of its associated count accumulation doc domain- * and per-seg count array.+ * array must correspond to the static index of its associated count accumulation doc domain and+ * per-seg count array.** @param countAccs - global-scope CountSlotAccs (one for each domain) to be incremented for the* most recently accumulated segmentdiff --git a/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java b/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.javaindex 76970a990cb..7560b332271 100644--- a/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java+++ b/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java@@ -537,7 +537,7 @@ public class DirectUpdateHandler2 extends UpdateHandler// Add to the transaction log *after* successfully adding to the// index, if there was no error.// This ordering ensures that if we log it, it's definitely been- // added to the the index.+ // added to the index.// This also ensures that if a commit sneaks in-between, that we// know everything in a particular// log version was definitely committed.diff --git a/solr/core/src/java/org/apache/solr/update/processor/DocBasedVersionConstraintsProcessor.java b/solr/core/src/java/org/apache/solr/update/processor/DocBasedVersionConstraintsProcessor.javaindex 7ca6b9e6572..48ecc0f7eed 100644--- a/solr/core/src/java/org/apache/solr/update/processor/DocBasedVersionConstraintsProcessor.java+++ b/solr/core/src/java/org/apache/solr/update/processor/DocBasedVersionConstraintsProcessor.java@@ -142,11 +142,10 @@ public class DocBasedVersionConstraintsProcessor extends UpdateRequestProcessor}/**- * Returns true if the specified new version values are greater the the ones already known to- * exist for the document, or if the document does not already exist. Returns false if the- * specified new versions are not high enough but the processor has been configured with- * ignoreOldUpdates=true Throws a SolrException if the version is not high enough and- * ignoreOldUpdates=false+ * Returns true if the specified new version values are greater the ones already known to exist+ * for the document, or if the document does not already exist. Returns false if the specified new+ * versions are not high enough but the processor has been configured with ignoreOldUpdates=true+ * Throws a SolrException if the version is not high enough and ignoreOldUpdates=false*/private boolean isVersionNewEnough(BytesRef indexedDocId, Object[] newUserVersions)throws IOException {diff --git a/solr/core/src/java/org/apache/solr/util/DataConfigNode.java b/solr/core/src/java/org/apache/solr/util/DataConfigNode.javaindex ae3e00e6759..554a020e68f 100644--- a/solr/core/src/java/org/apache/solr/util/DataConfigNode.java+++ b/solr/core/src/java/org/apache/solr/util/DataConfigNode.java@@ -86,7 +86,7 @@ public class DataConfigNode implements ConfigNode {public Map<String, String> attributes() {if (rawAttributes.isEmpty()) return rawAttributes; // avoid unnecessary object creation- // Note: using the the 4 arg toMap to force LinkedHashMap.+ // Note: using the 4 arg toMap to force LinkedHashMap.// Duplicate keys should be impossible, but toMap makes us specify a mergeFunctionreturn rawAttributes.entrySet().stream().collect(diff --git a/solr/core/src/test/org/apache/solr/cloud/DistribCursorPagingTest.java b/solr/core/src/test/org/apache/solr/cloud/DistribCursorPagingTest.javaindex 018e3fe5a1c..b70615e499a 100644--- a/solr/core/src/test/org/apache/solr/cloud/DistribCursorPagingTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/DistribCursorPagingTest.java@@ -766,9 +766,9 @@ public class DistribCursorPagingTest extends AbstractFullDistribZkTestBase {/*** Given a set of params, executes a cursor query using {@link CursorMarkParams#CURSOR_MARK_START}* and then continuously walks the results using {@link CursorMarkParams#CURSOR_MARK_START} as- * long as a non-0 number of docs ar returned. This method records the the set of all id's (must- * be positive ints) encountered and throws an assertion failure if any id is encountered more- * than once, or if an id is encountered which is not expected, or if an id is <code>[elevated]+ * long as a non-0 number of docs ar returned. This method records the set of all id's (must be+ * positive ints) encountered and throws an assertion failure if any id is encountered more than+ * once, or if an id is encountered which is not expected, or if an id is <code>[elevated]* </code> and comes "after" any ids which were not <code>[elevated]</code>** @return set of all elevated ids encountered in the walk@@ -822,9 +822,9 @@ public class DistribCursorPagingTest extends AbstractFullDistribZkTestBase {/*** Given a set of params, executes a cursor query using {@link CursorMarkParams#CURSOR_MARK_START}* and then continuously walks the results using {@link CursorMarkParams#CURSOR_MARK_START} as- * long as a non-0 number of docs ar returned. This method records the the set of all id's (must- * be positive ints) encountered and throws an assertion failure if any id is encountered more- * then once, or if the set grows above maxSize+ * long as a non-0 number of docs ar returned. This method records the set of all id's (must be+ * positive ints) encountered and throws an assertion failure if any id is encountered more then+ * once, or if the set grows above maxSize** <p>Note that this method explicitly uses the "cloudClient" for executing the queries, instead* of relying on the test infrastructure to execute the queries redundently against both the clouddiff --git a/solr/core/src/test/org/apache/solr/cloud/TestCloudDeleteByQuery.java b/solr/core/src/test/org/apache/solr/cloud/TestCloudDeleteByQuery.javaindex e77d5b46f05..451ef12dab6 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestCloudDeleteByQuery.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestCloudDeleteByQuery.java@@ -212,7 +212,7 @@ public class TestCloudDeleteByQuery extends SolrCloudTestCase {assertTrue("shard routing prefixes don't seem to be aligned anymore, "+ "did someone change the default routing rules? "- + "and/or the the default shard name rules? "+ + "and/or the default shard name rules? "+ "and/or the numShards used by this test? ... "+ expected+ " is ot the same as [shard] == '"diff --git a/solr/core/src/test/org/apache/solr/cloud/TestTolerantUpdateProcessorCloud.java b/solr/core/src/test/org/apache/solr/cloud/TestTolerantUpdateProcessorCloud.javaindex 958621541bf..dc0a4435949 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestTolerantUpdateProcessorCloud.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestTolerantUpdateProcessorCloud.java@@ -191,7 +191,7 @@ public class TestTolerantUpdateProcessorCloud extends SolrCloudTestCase {assertTrue("shard routing prefixes don't seem to be aligned anymore, "+ "did someone change the default routing rules? "- + "and/or the the default shard name rules? "+ + "and/or the default shard name rules? "+ "and/or the numShards used by this test? ... "+ expected+ " is ot the same as [shard] == '"diff --git a/solr/core/src/test/org/apache/solr/search/neural/KnnQParserTest.java b/solr/core/src/test/org/apache/solr/search/neural/KnnQParserTest.javaindex 398b9215044..32f936dc63a 100644--- a/solr/core/src/test/org/apache/solr/search/neural/KnnQParserTest.java+++ b/solr/core/src/test/org/apache/solr/search/neural/KnnQParserTest.java@@ -763,7 +763,7 @@ public class KnnQParserTest extends SolrTestCaseJ4 {// These req's are equivalent: pre-filter nothing// So 1,4,2,10,3,7 are the topK=6- // Only 7 matches both of the the regular fq params+ // Only 7 matches both of the regular fq paramsfor (SolrQueryRequest req :Arrays.asList(// explicit local empty preFilterdiff --git a/solr/core/src/test/org/apache/solr/search/neural/VectorSimilarityQParserTest.java b/solr/core/src/test/org/apache/solr/search/neural/VectorSimilarityQParserTest.javaindex cf6aeb65973..c87ed9e8a10 100644--- a/solr/core/src/test/org/apache/solr/search/neural/VectorSimilarityQParserTest.java+++ b/solr/core/src/test/org/apache/solr/search/neural/VectorSimilarityQParserTest.java@@ -706,7 +706,7 @@ public class VectorSimilarityQParserTest extends SolrTestCaseJ4 {// These req's are equivalent: pre-filter nothing// So 1,4,2,10,3,7,5,6 are the minReturn=0.8- // Only 7 matches both of the the regular fq params+ // Only 7 matches both of the regular fq paramsfor (SolrQueryRequest req :Arrays.asList(// explicit local empty preFilterdiff --git a/solr/modules/llm/src/java/org/apache/solr/llm/textvectorisation/store/rest/ManagedTextToVectorModelStore.java b/solr/modules/llm/src/java/org/apache/solr/llm/textvectorisation/store/rest/ManagedTextToVectorModelStore.javaindex ffab7207075..2ae76c45017 100644--- a/solr/modules/llm/src/java/org/apache/solr/llm/textvectorisation/store/rest/ManagedTextToVectorModelStore.java+++ b/solr/modules/llm/src/java/org/apache/solr/llm/textvectorisation/store/rest/ManagedTextToVectorModelStore.java@@ -37,7 +37,7 @@ import org.apache.solr.rest.ManagedResourceStorage;import org.slf4j.Logger;import org.slf4j.LoggerFactory;-/** Managed Resource wrapper for the the {@link TextToVectorModelStore} to expose it via REST */+/** Managed Resource wrapper for the {@link TextToVectorModelStore} to expose it via REST */@ThreadSafepublic class ManagedTextToVectorModelStore extends ManagedResourceimplements ManagedResource.ChildResourceSupport {diff --git a/solr/modules/ltr/src/test-files/solr/collection1/conf/solrconfig-ltr.xml b/solr/modules/ltr/src/test-files/solr/collection1/conf/solrconfig-ltr.xmlindex 496755c9765..528922684d3 100644--- a/solr/modules/ltr/src/test-files/solr/collection1/conf/solrconfig-ltr.xml+++ b/solr/modules/ltr/src/test-files/solr/collection1/conf/solrconfig-ltr.xml@@ -33,7 +33,7 @@<!-- add a transformer that will encode the document features in the response.For each document the transformer will add the features as an extra field- in the response. The name of the field we will be the the name of the transformer+ in the response. The name of the field will be the name of the transformerenclosed between brackets (in this case [fv]). In order to get the featurevector you will have to specify that you want the field (e.g., fl="*,[fv]) --><transformer name="fv" class="org.apache.solr.ltr.response.transform.LTRFeatureLoggerTransformerFactory">diff --git a/solr/modules/ltr/src/test-files/solr/collection1/conf/solrconfig-ltr_Th10_10.xml b/solr/modules/ltr/src/test-files/solr/collection1/conf/solrconfig-ltr_Th10_10.xmlindex 32f8751a9f8..b46fa3141c0 100644--- a/solr/modules/ltr/src/test-files/solr/collection1/conf/solrconfig-ltr_Th10_10.xml+++ b/solr/modules/ltr/src/test-files/solr/collection1/conf/solrconfig-ltr_Th10_10.xml@@ -37,7 +37,7 @@<!-- add a transformer that will encode the document features in the response.For each document the transformer will add the features as an extra field- in the response. The name of the field we will be the the name of the transformer+ in the response. The name of the field will be the name of the transformerenclosed between brackets (in this case [fv]). In order to get the featurevector you will have to specify that you want the field (e.g., fl="*,[fv]) --><transformer name="fv" class="org.apache.solr.ltr.response.transform.LTRFeatureLoggerTransformerFactory">diff --git a/solr/modules/ltr/src/test-files/solr/collection1/conf/solrconfig-multiseg.xml b/solr/modules/ltr/src/test-files/solr/collection1/conf/solrconfig-multiseg.xmlindex 04ee42b3834..61d261d418b 100644--- a/solr/modules/ltr/src/test-files/solr/collection1/conf/solrconfig-multiseg.xml+++ b/solr/modules/ltr/src/test-files/solr/collection1/conf/solrconfig-multiseg.xml@@ -37,7 +37,7 @@</mergePolicyFactory><!-- add a transformer that will encode the document features in the response.For each document the transformer will add the features as an extra field- in the response. The name of the field we will be the the name of the transformer+ in the response. The name of the field will be the name of the transformerenclosed between brackets (in this case [fv]). In order to get the featurevector you will have to specify that you want the field (e.g., fl="*,[fv]) --><transformer name="features" class="org.apache.solr.ltr.response.transform.LTRFeatureLoggerTransformerFactory">diff --git a/solr/solr-ref-guide/modules/query-guide/pages/dense-vector-search.adoc b/solr/solr-ref-guide/modules/query-guide/pages/dense-vector-search.adocindex aa1c316f51d..856c63329ff 100644--- a/solr/solr-ref-guide/modules/query-guide/pages/dense-vector-search.adoc+++ b/solr/solr-ref-guide/modules/query-guide/pages/dense-vector-search.adoc@@ -667,7 +667,7 @@ If we modify the above request to add tags to the `fq` parameters, we can specif&fq={!tag=for_knn}inStock:true-----In this example, only the `inStock:true` filter will be used for Pre-Filtering to find the the `topK=10` documents, and the `category:AAA` filter will be applied independently; possibly resulting in less then 10 total matches.+In this example, only the `inStock:true` filter will be used for Pre-Filtering to find the `topK=10` documents, and the `category:AAA` filter will be applied independently; possibly resulting in less then 10 total matches.Some use cases where `includeTags` and/or `excludeTags` may be more useful then an explicit `preFilter` parameters:diff --git a/solr/test-framework/src/java/org/apache/solr/handler/BackupStatusChecker.java b/solr/test-framework/src/java/org/apache/solr/handler/BackupStatusChecker.javaindex d752367ce39..6210fe19477 100644--- a/solr/test-framework/src/java/org/apache/solr/handler/BackupStatusChecker.java+++ b/solr/test-framework/src/java/org/apache/solr/handler/BackupStatusChecker.java@@ -125,7 +125,7 @@ public final class BackupStatusChecker {** <p><b>NOTE:</b> this method is <em>NOT</em> suitable/safe to use in a test where multiple* backups are being taken/deleted concurrently, because the replication handler API provides no- * reliable way to determine if the the most recently reported status to the a particular backup+ * reliable way to determine if the most recently reported status to the a particular backup* request.** @param directoryName to compare to, may be null@@ -161,7 +161,7 @@ public final class BackupStatusChecker {** <p><b>NOTE:</b> this method is <em>NOT</em> suitable/safe to use in a test where multiple* backups are being taken/deleted concurrently, because the replication handler API provides no- * reliable way to determine if the the most recently reported status to the a particular backup+ * reliable way to determine if the most recently reported status to the a particular backup* request.** @return the "directoryName" of the backup if the response indicates that a is completeddiff --git a/solr/webapp/web/js/angular/controllers/cloud.js b/solr/webapp/web/js/angular/controllers/cloud.jsindex 01e284b2001..b766c9a6e6b 100644--- a/solr/webapp/web/js/angular/controllers/cloud.js+++ b/solr/webapp/web/js/angular/controllers/cloud.js@@ -599,7 +599,7 @@ var treeSubController = function($scope, Zookeeper) {* Translates seconds into human readable format of seconds, minutes, hours, days, and years** @param {number} seconds The number of seconds to be processed- * @return {string} The phrase describing the the amount of time+ * @return {string} The phrase describing the amount of time*/function secondsForHumans ( seconds ) {var levels = [