You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by cp...@apache.org on 2021/04/09 10:18:42 UTC
[solr] branch main updated (27c66a3 -> 08d7f05)
This is an automated email from the ASF dual-hosted git repository.
cpoerschke pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/solr.git.
from 27c66a3 SOLR-15002 Upgrade httpclient to 4.5.13 and httpcore to 4.4.13 (#27)
new 23e277b fix 2 typos in help/validateLogCalls.txt
new 08d7f05 fix 'succes[s]ful' typo in a RecoveryStrategy error log message
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
help/validateLogCalls.txt | 2 +-
solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
[solr] 02/02: fix 'succes[s]ful' typo in a RecoveryStrategy error
log message
Posted by cp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cpoerschke pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/solr.git
commit 08d7f057717ccb63ea56061d20a7ff3e0faad252
Author: Christine Poerschke <cp...@apache.org>
AuthorDate: Fri Apr 9 10:33:04 2021 +0100
fix 'succes[s]ful' typo in a RecoveryStrategy error log message
---
solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java b/solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java
index 0ca1a47..9465bc4 100644
--- a/solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java
+++ b/solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java
@@ -403,7 +403,7 @@ public class RecoveryStrategy implements Runnable, Closeable {
try {
zkController.publish(this.coreDescriptor, Replica.State.ACTIVE);
} catch (Exception e) {
- log.error("Could not publish as ACTIVE after succesful recovery", e);
+ log.error("Could not publish as ACTIVE after successful recovery", e);
successfulRecovery = false;
}
[solr] 01/02: fix 2 typos in help/validateLogCalls.txt
Posted by cp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cpoerschke pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/solr.git
commit 23e277bf5e31977e844bba158eb03b61ee1e4c55
Author: Christine Poerschke <cp...@apache.org>
AuthorDate: Fri Apr 9 10:30:41 2021 +0100
fix 2 typos in help/validateLogCalls.txt
---
help/validateLogCalls.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/help/validateLogCalls.txt b/help/validateLogCalls.txt
index b177bdb..c62ecbb 100644
--- a/help/validateLogCalls.txt
+++ b/help/validateLogCalls.txt
@@ -59,7 +59,7 @@ NOTES:
function calls, but will be flagged if they contain plusses that aren't
simple concatenation. This last is something of a style check.
-- You can get into some pretty convolued consructs trying to pass some of these
+- You can get into some pretty convoluted constructs trying to pass some of these
checks. Adding //nowarn, with or without spaces will cause the line to pass
no matter what. Please use this hack sparingly and be conscientious about
surrounding with 'if (log.is*Enabled)'.