You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2021/10/12 10:18:57 UTC
[tomcat] branch main updated (842a39d -> 7bff922)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git.
from 842a39d More debug information for failures
new 6247932 Differentiate log messages in KubernetesMembershipProvider with a parameter
new 7bff922 Add missing delimiters
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:
.../membership/cloud/KubernetesMembershipProvider.java | 12 ++++++------
.../catalina/tribes/membership/cloud/LocalStrings.properties | 12 ++++++------
.../tribes/membership/cloud/LocalStrings_cs.properties | 2 +-
.../tribes/membership/cloud/LocalStrings_de.properties | 6 +++---
.../tribes/membership/cloud/LocalStrings_es.properties | 6 +++---
.../tribes/membership/cloud/LocalStrings_fr.properties | 4 ++--
.../tribes/membership/cloud/LocalStrings_ja.properties | 6 +++---
.../tribes/membership/cloud/LocalStrings_ko.properties | 8 ++++----
.../tribes/membership/cloud/LocalStrings_pt_BR.properties | 2 +-
.../tribes/membership/cloud/LocalStrings_zh_CN.properties | 10 +++++-----
webapps/docs/changelog.xml | 9 +++++++++
11 files changed, 43 insertions(+), 34 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 02/02: Add missing delimiters
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 7bff9226f377acd471bc368be71bdded91e97185
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Oct 12 11:18:02 2021 +0100
Add missing delimiters
---
.../catalina/tribes/membership/cloud/LocalStrings.properties | 10 +++++-----
.../tribes/membership/cloud/LocalStrings_cs.properties | 2 +-
.../tribes/membership/cloud/LocalStrings_de.properties | 6 +++---
.../tribes/membership/cloud/LocalStrings_es.properties | 4 ++--
.../tribes/membership/cloud/LocalStrings_fr.properties | 2 +-
.../tribes/membership/cloud/LocalStrings_ja.properties | 4 ++--
.../tribes/membership/cloud/LocalStrings_ko.properties | 6 +++---
.../tribes/membership/cloud/LocalStrings_pt_BR.properties | 2 +-
.../tribes/membership/cloud/LocalStrings_zh_CN.properties | 8 ++++----
9 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/java/org/apache/catalina/tribes/membership/cloud/LocalStrings.properties b/java/org/apache/catalina/tribes/membership/cloud/LocalStrings.properties
index 047ea21..c0da6be 100644
--- a/java/org/apache/catalina/tribes/membership/cloud/LocalStrings.properties
+++ b/java/org/apache/catalina/tribes/membership/cloud/LocalStrings.properties
@@ -14,20 +14,20 @@
# limitations under the License.
abstractStream.CACertUndefined=CA cert file undefined
-abstractStream.fileNotFound=CA cert file {0} not found
-abstractStream.trustManagerError=Could not create trust manager for {0}
+abstractStream.fileNotFound=CA cert file [{0}] not found
+abstractStream.trustManagerError=Could not create trust manager for [{0}]
-certificateStream.clientCertError=Could not create key manager for {0} ({1})
+certificateStream.clientCertError=Could not create key manager for [{0}] ([{1}])
cloudMembershipService.stopFail=Unable to stop the cloud membership service, level: [{0}]
dnsMembershipProvider.dnsError=Error getting hosts address list for namespace [{0}]
kubernetesMembershipProvider.invalidPod=Pod is missing some required attributes: [{0}]
-kubernetesMembershipProvider.invalidPodsList=Invalid pods list: {0}
+kubernetesMembershipProvider.invalidPodsList=Invalid pods list: [{0}]
kubernetesMembershipProvider.jsonError=JSON error
kubernetesMembershipProvider.memberError=Error creating member
kubernetesMembershipProvider.noNamespace=Namespace not set
kubernetesMembershipProvider.streamError=Failed to open stream
-tokenStream.failedConnection=Failed connection to {0} with token {1}
+tokenStream.failedConnection=Failed connection to [{0}] with token [{1}]
diff --git a/java/org/apache/catalina/tribes/membership/cloud/LocalStrings_cs.properties b/java/org/apache/catalina/tribes/membership/cloud/LocalStrings_cs.properties
index 8b7e477..0b2dd1e 100644
--- a/java/org/apache/catalina/tribes/membership/cloud/LocalStrings_cs.properties
+++ b/java/org/apache/catalina/tribes/membership/cloud/LocalStrings_cs.properties
@@ -13,6 +13,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-abstractStream.trustManagerError=Nepodařilo se vytvořit trust manager pro {0}
+abstractStream.trustManagerError=Nepodařilo se vytvořit trust manager pro [{0}]
cloudMembershipService.stopFail=Nelze zastavit službu cloudového členství, úroveň: [{0}]
diff --git a/java/org/apache/catalina/tribes/membership/cloud/LocalStrings_de.properties b/java/org/apache/catalina/tribes/membership/cloud/LocalStrings_de.properties
index eedd2ef..97cbfdb 100644
--- a/java/org/apache/catalina/tribes/membership/cloud/LocalStrings_de.properties
+++ b/java/org/apache/catalina/tribes/membership/cloud/LocalStrings_de.properties
@@ -13,9 +13,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-abstractStream.fileNotFound=CA Zertifikats Datei {0} nicht gefunden
-abstractStream.trustManagerError=Konnte keinen Trust Manager für {0} erzeugen.
+abstractStream.fileNotFound=CA Zertifikats Datei [{0}] nicht gefunden
+abstractStream.trustManagerError=Konnte keinen Trust Manager für [{0}] erzeugen.
-certificateStream.clientCertError=Es konnte kein Schlüssel-Manager für {0} ({1}) erzeugt werden
+certificateStream.clientCertError=Es konnte kein Schlüssel-Manager für [{0}] ([{1}]) erzeugt werden
dnsMembershipProvider.dnsError=Fehler beim Empfang der Host Adressenliste für den Namespace [{0}]
diff --git a/java/org/apache/catalina/tribes/membership/cloud/LocalStrings_es.properties b/java/org/apache/catalina/tribes/membership/cloud/LocalStrings_es.properties
index 0c0ab78..6c74193 100644
--- a/java/org/apache/catalina/tribes/membership/cloud/LocalStrings_es.properties
+++ b/java/org/apache/catalina/tribes/membership/cloud/LocalStrings_es.properties
@@ -13,8 +13,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-abstractStream.fileNotFound=No se encontró el archivo del certificado CA {0}
-abstractStream.trustManagerError=No se pudo crear el administrador de confianza para {0}
+abstractStream.fileNotFound=No se encontró el archivo del certificado CA [{0}]
+abstractStream.trustManagerError=No se pudo crear el administrador de confianza para [{0}]
cloudMembershipService.stopFail=No se pudo detener el servicio de miembros estáticos, nivel: [{0}]
diff --git a/java/org/apache/catalina/tribes/membership/cloud/LocalStrings_fr.properties b/java/org/apache/catalina/tribes/membership/cloud/LocalStrings_fr.properties
index 0f259c6..a389b01 100644
--- a/java/org/apache/catalina/tribes/membership/cloud/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/tribes/membership/cloud/LocalStrings_fr.properties
@@ -17,7 +17,7 @@ abstractStream.CACertUndefined=Le fichier certificat CA n'est pas défini
abstractStream.fileNotFound=Le fichier [{0}] définissant l''autorité des certificats (CA) n''a pas été trouvé
abstractStream.trustManagerError=Echec de création d''un gestionnaire de confiance (trust manager) pour [{0}]
-certificateStream.clientCertError=Impossible de créer le gestionnaire de clés pour {0} ({1})
+certificateStream.clientCertError=Impossible de créer le gestionnaire de clés pour [{0}] ([{1}])
cloudMembershipService.stopFail=Impossible d''arrêter le registre de membres statique, niveau : [{0}]
diff --git a/java/org/apache/catalina/tribes/membership/cloud/LocalStrings_ja.properties b/java/org/apache/catalina/tribes/membership/cloud/LocalStrings_ja.properties
index e374fc1..6061a4b 100644
--- a/java/org/apache/catalina/tribes/membership/cloud/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/tribes/membership/cloud/LocalStrings_ja.properties
@@ -17,7 +17,7 @@ abstractStream.CACertUndefined=CA 証明書ファイルが未定義です。
abstractStream.fileNotFound=CA 証明書ファイル [{0}] が見つかりません。
abstractStream.trustManagerError=[{0}] のトラストマネージャーを作成できませんでした。
-certificateStream.clientCertError={0}（{1}）のキーマネージャーを作成できませんでした
+certificateStream.clientCertError=[{0}]（[{1}]）のキーマネージャーを作成できませんでした
cloudMembershipService.stopFail=レベル [{0}] のメンバーシップサービスを停止できませんでした。
@@ -30,4 +30,4 @@ kubernetesMembershipProvider.memberError=メンバー作成中のエラー
kubernetesMembershipProvider.noNamespace=Namespace が未指定です。
kubernetesMembershipProvider.streamError=ストリームのオープンに失敗しました
-tokenStream.failedConnection=トークン{1}で{0}への接続に失敗しました。
+tokenStream.failedConnection=トークン[{1}]で[{0}]への接続に失敗しました。
diff --git a/java/org/apache/catalina/tribes/membership/cloud/LocalStrings_ko.properties b/java/org/apache/catalina/tribes/membership/cloud/LocalStrings_ko.properties
index 44413a4..473c018 100644
--- a/java/org/apache/catalina/tribes/membership/cloud/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/tribes/membership/cloud/LocalStrings_ko.properties
@@ -17,17 +17,17 @@ abstractStream.CACertUndefined=CA 인증서 파일이 정의되지 않았습니
abstractStream.fileNotFound=CA 인증서 파일 [{0}]을(를) 찾을 수 없습니다.
abstractStream.trustManagerError=[{0}]을(를) 위한 Trust Manager를 생성할 수 없었습니다.
-certificateStream.clientCertError={0}({1})을(를) 위한 키 매니저를 생성할 수 없습니다.
+certificateStream.clientCertError=[{0}]([{1}])을(를) 위한 키 매니저를 생성할 수 없습니다.
cloudMembershipService.stopFail=정적 멤버십 서비스를 중단할 수 없습니다. 레벨: [{0}]
dnsMembershipProvider.dnsError=네임스페이스 [{0}]을(를) 위한, 호스트들의 주소 목록을 얻는 중 오류 발생
kubernetesMembershipProvider.invalidPod=Pod에 일부 필수 속성들이 없습니다: [{0}]
-kubernetesMembershipProvider.invalidPodsList=유효하지 않은 pod들의 목록: {0}
+kubernetesMembershipProvider.invalidPodsList=유효하지 않은 pod들의 목록: [{0}]
kubernetesMembershipProvider.jsonError=JSON 오류
kubernetesMembershipProvider.memberError=멤버 생성 중 오류 발생
kubernetesMembershipProvider.noNamespace=네임스페이스가 설정 안됨
kubernetesMembershipProvider.streamError=스트림을 열지 못했습니다.
-tokenStream.failedConnection=토큰 {1}을(를) 사용하여 {0}에 연결을 맺지 못했습니다.
+tokenStream.failedConnection=토큰 [{1}]을(를) 사용하여 [{0}]에 연결을 맺지 못했습니다.
diff --git a/java/org/apache/catalina/tribes/membership/cloud/LocalStrings_pt_BR.properties b/java/org/apache/catalina/tribes/membership/cloud/LocalStrings_pt_BR.properties
index 0bb5db0..da45a3f 100644
--- a/java/org/apache/catalina/tribes/membership/cloud/LocalStrings_pt_BR.properties
+++ b/java/org/apache/catalina/tribes/membership/cloud/LocalStrings_pt_BR.properties
@@ -13,6 +13,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-abstractStream.trustManagerError=Impossível criar trust manager para {0}
+abstractStream.trustManagerError=Impossível criar trust manager para [{0}]
cloudMembershipService.stopFail=Impossível parar o serviço de membros estáticos, nível: [{0}]
diff --git a/java/org/apache/catalina/tribes/membership/cloud/LocalStrings_zh_CN.properties b/java/org/apache/catalina/tribes/membership/cloud/LocalStrings_zh_CN.properties
index e48a6cc..1ad6c1a 100644
--- a/java/org/apache/catalina/tribes/membership/cloud/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/tribes/membership/cloud/LocalStrings_zh_CN.properties
@@ -15,19 +15,19 @@
abstractStream.CACertUndefined=CA证书文件未定义
abstractStream.fileNotFound=未找到 CA 证书文件 [{0}]
-abstractStream.trustManagerError=无法为{0}创建信任管理器
+abstractStream.trustManagerError=无法为[{0}]创建信任管理器
-certificateStream.clientCertError=无法为{0} {1} 创建key管理器
+certificateStream.clientCertError=无法为[{0}] [{1}] 创建key管理器
cloudMembershipService.stopFail=无法停止云成员资格服务，级别为：[{0}]
dnsMembershipProvider.dnsError=由于命名空间[{0}]导致的多个错误主机地址
kubernetesMembershipProvider.invalidPod=Pod丢失了一些必须的属性：[{0}]。
-kubernetesMembershipProvider.invalidPodsList=无效的播客列表：{0}。
+kubernetesMembershipProvider.invalidPodsList=无效的播客列表：[{0}]。
kubernetesMembershipProvider.jsonError=JSON错误
kubernetesMembershipProvider.memberError=创建成员错误
kubernetesMembershipProvider.noNamespace=命名空间未设置
kubernetesMembershipProvider.streamError=无法打开流。
-tokenStream.failedConnection=无法使用标记{1}连接到{0}
+tokenStream.failedConnection=无法使用标记[{1}]连接到[{0}]
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 01/02: Differentiate log messages in
KubernetesMembershipProvider with a parameter
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 624793225737daa652c4ad03d6e5bf957f1c27f2
Author: Hal Deadman <ha...@gmail.com>
AuthorDate: Mon Oct 11 21:10:30 2021 -0400
Differentiate log messages in KubernetesMembershipProvider with a parameter
---
.../membership/cloud/KubernetesMembershipProvider.java | 12 ++++++------
.../catalina/tribes/membership/cloud/LocalStrings.properties | 2 +-
.../tribes/membership/cloud/LocalStrings_es.properties | 2 +-
.../tribes/membership/cloud/LocalStrings_fr.properties | 2 +-
.../tribes/membership/cloud/LocalStrings_ja.properties | 2 +-
.../tribes/membership/cloud/LocalStrings_ko.properties | 2 +-
.../tribes/membership/cloud/LocalStrings_zh_CN.properties | 2 +-
webapps/docs/changelog.xml | 9 +++++++++
8 files changed, 21 insertions(+), 12 deletions(-)
diff --git a/java/org/apache/catalina/tribes/membership/cloud/KubernetesMembershipProvider.java b/java/org/apache/catalina/tribes/membership/cloud/KubernetesMembershipProvider.java
index db8455a..92bef68 100644
--- a/java/org/apache/catalina/tribes/membership/cloud/KubernetesMembershipProvider.java
+++ b/java/org/apache/catalina/tribes/membership/cloud/KubernetesMembershipProvider.java
@@ -156,7 +156,7 @@ public class KubernetesMembershipProvider extends CloudMembershipProvider {
List<Object> items = (List<Object>) itemsObject;
for (Object podObject : items) {
if (!(podObject instanceof LinkedHashMap<?, ?>)) {
- log.warn(sm.getString("kubernetesMembershipProvider.invalidPod"));
+ log.warn(sm.getString("kubernetesMembershipProvider.invalidPod", "item"));
continue;
}
LinkedHashMap<String, Object> pod = (LinkedHashMap<String, Object>) podObject;
@@ -168,26 +168,26 @@ public class KubernetesMembershipProvider extends CloudMembershipProvider {
// "metadata" contains "name", "uid" and "creationTimestamp"
Object metadataObject = pod.get("metadata");
if (!(metadataObject instanceof LinkedHashMap<?, ?>)) {
- log.warn(sm.getString("kubernetesMembershipProvider.invalidPod"));
+ log.warn(sm.getString("kubernetesMembershipProvider.invalidPod", "metadata"));
continue;
}
LinkedHashMap<String, Object> metadata = (LinkedHashMap<String, Object>) metadataObject;
Object nameObject = metadata.get("name");
if (nameObject == null) {
- log.warn(sm.getString("kubernetesMembershipProvider.invalidPod"));
+ log.warn(sm.getString("kubernetesMembershipProvider.invalidPod", "name"));
continue;
}
Object objectUid = metadata.get("uid");
Object creationTimestampObject = metadata.get("creationTimestamp");
if (creationTimestampObject == null) {
- log.warn(sm.getString("kubernetesMembershipProvider.invalidPod"));
+ log.warn(sm.getString("kubernetesMembershipProvider.invalidPod", "uid"));
continue;
}
String creationTimestamp = creationTimestampObject.toString();
// "status" contains "phase" (which must be "Running") and "podIP"
Object statusObject = pod.get("status");
if (!(statusObject instanceof LinkedHashMap<?, ?>)) {
- log.warn(sm.getString("kubernetesMembershipProvider.invalidPod"));
+ log.warn(sm.getString("kubernetesMembershipProvider.invalidPod", "status"));
continue;
}
LinkedHashMap<String, Object> status = (LinkedHashMap<String, Object>) statusObject;
@@ -196,7 +196,7 @@ public class KubernetesMembershipProvider extends CloudMembershipProvider {
}
Object podIPObject = status.get("podIP");
if (podIPObject == null) {
- log.warn(sm.getString("kubernetesMembershipProvider.invalidPod"));
+ log.warn(sm.getString("kubernetesMembershipProvider.invalidPod", "podIP"));
continue;
}
String podIP = podIPObject.toString();
diff --git a/java/org/apache/catalina/tribes/membership/cloud/LocalStrings.properties b/java/org/apache/catalina/tribes/membership/cloud/LocalStrings.properties
index 5c1ec09..047ea21 100644
--- a/java/org/apache/catalina/tribes/membership/cloud/LocalStrings.properties
+++ b/java/org/apache/catalina/tribes/membership/cloud/LocalStrings.properties
@@ -23,7 +23,7 @@ cloudMembershipService.stopFail=Unable to stop the cloud membership service, lev
dnsMembershipProvider.dnsError=Error getting hosts address list for namespace [{0}]
-kubernetesMembershipProvider.invalidPod=Pod is missing some required attributes
+kubernetesMembershipProvider.invalidPod=Pod is missing some required attributes: [{0}]
kubernetesMembershipProvider.invalidPodsList=Invalid pods list: {0}
kubernetesMembershipProvider.jsonError=JSON error
kubernetesMembershipProvider.memberError=Error creating member
diff --git a/java/org/apache/catalina/tribes/membership/cloud/LocalStrings_es.properties b/java/org/apache/catalina/tribes/membership/cloud/LocalStrings_es.properties
index 440aabf..0c0ab78 100644
--- a/java/org/apache/catalina/tribes/membership/cloud/LocalStrings_es.properties
+++ b/java/org/apache/catalina/tribes/membership/cloud/LocalStrings_es.properties
@@ -18,4 +18,4 @@ abstractStream.trustManagerError=No se pudo crear el administrador de confianza
cloudMembershipService.stopFail=No se pudo detener el servicio de miembros estáticos, nivel: [{0}]
-kubernetesMembershipProvider.invalidPod=Algunos atributos requeridos faltan en el Pod
+kubernetesMembershipProvider.invalidPod=Algunos atributos requeridos faltan en el Pod: [{0}]
diff --git a/java/org/apache/catalina/tribes/membership/cloud/LocalStrings_fr.properties b/java/org/apache/catalina/tribes/membership/cloud/LocalStrings_fr.properties
index 0d207b6..0f259c6 100644
--- a/java/org/apache/catalina/tribes/membership/cloud/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/tribes/membership/cloud/LocalStrings_fr.properties
@@ -23,7 +23,7 @@ cloudMembershipService.stopFail=Impossible d''arrêter le registre de membres st
dnsMembershipProvider.dnsError=Erreur en obtenant la liste des adresses des hôtes pour l''espace de noms [{0}]
-kubernetesMembershipProvider.invalidPod=Le pod manque des attributs nécessaires
+kubernetesMembershipProvider.invalidPod=Le pod manque des attributs nécessaires: [{0}]
kubernetesMembershipProvider.invalidPodsList=La liste de pods est invalide : [{0}]
kubernetesMembershipProvider.jsonError=Erreur JSON
kubernetesMembershipProvider.memberError=Erreur de création d'un membre
diff --git a/java/org/apache/catalina/tribes/membership/cloud/LocalStrings_ja.properties b/java/org/apache/catalina/tribes/membership/cloud/LocalStrings_ja.properties
index 124bdc3..e374fc1 100644
--- a/java/org/apache/catalina/tribes/membership/cloud/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/tribes/membership/cloud/LocalStrings_ja.properties
@@ -23,7 +23,7 @@ cloudMembershipService.stopFail=レベル [{0}] のメンバーシップサー
dnsMembershipProvider.dnsError=名前空間 [{0}] のホストアドレスリスト取得中のエラー
-kubernetesMembershipProvider.invalidPod=Pod に必要な属性がありません。
+kubernetesMembershipProvider.invalidPod=Pod に必要な属性がありません。: [{0}]
kubernetesMembershipProvider.invalidPodsList=不正な Pod リストです: [{0}]
kubernetesMembershipProvider.jsonError=JSONエラー
kubernetesMembershipProvider.memberError=メンバー作成中のエラー
diff --git a/java/org/apache/catalina/tribes/membership/cloud/LocalStrings_ko.properties b/java/org/apache/catalina/tribes/membership/cloud/LocalStrings_ko.properties
index 5786269..44413a4 100644
--- a/java/org/apache/catalina/tribes/membership/cloud/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/tribes/membership/cloud/LocalStrings_ko.properties
@@ -23,7 +23,7 @@ cloudMembershipService.stopFail=정적 멤버십 서비스를 중단할 수 없
dnsMembershipProvider.dnsError=네임스페이스 [{0}]을(를) 위한, 호스트들의 주소 목록을 얻는 중 오류 발생
-kubernetesMembershipProvider.invalidPod=Pod에 일부 필수 속성들이 없습니다.
+kubernetesMembershipProvider.invalidPod=Pod에 일부 필수 속성들이 없습니다: [{0}]
kubernetesMembershipProvider.invalidPodsList=유효하지 않은 pod들의 목록: {0}
kubernetesMembershipProvider.jsonError=JSON 오류
kubernetesMembershipProvider.memberError=멤버 생성 중 오류 발생
diff --git a/java/org/apache/catalina/tribes/membership/cloud/LocalStrings_zh_CN.properties b/java/org/apache/catalina/tribes/membership/cloud/LocalStrings_zh_CN.properties
index e8cc5d2..e48a6cc 100644
--- a/java/org/apache/catalina/tribes/membership/cloud/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/tribes/membership/cloud/LocalStrings_zh_CN.properties
@@ -23,7 +23,7 @@ cloudMembershipService.stopFail=无法停止云成员资格服务，级别为：
dnsMembershipProvider.dnsError=由于命名空间[{0}]导致的多个错误主机地址
-kubernetesMembershipProvider.invalidPod=Pod丢失了一些必须的属性
+kubernetesMembershipProvider.invalidPod=Pod丢失了一些必须的属性：[{0}]。
kubernetesMembershipProvider.invalidPodsList=无效的播客列表：{0}。
kubernetesMembershipProvider.jsonError=JSON错误
kubernetesMembershipProvider.memberError=创建成员错误
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index febc140..fb6b2d0 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -173,6 +173,15 @@
</update>
</changelog>
</subsection>
+ <subsection name="Tribes">
+ <changelog>
+ <fix>
+ <pr>454</pr>: Differentiate warning messages in
+ <code>KubernetesMembershipProvider</code> so that the missing attribute
+ is clear to the user. PR provided by Hal Deadman. (markt)
+ </fix>
+ </changelog>
+ </subsection>
</section>
<section name="Tomcat 10.1.0-M6 (markt)" rtext="2021-10-01">
<subsection name="Catalina">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org