You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2024/08/22 08:49:48 UTC
(directory-server) branch master updated: Fixed previous merge
This is an automated email from the ASF dual-hosted git repository.
elecharny pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/directory-server.git
The following commit(s) were added to refs/heads/master by this push:
new 0dd78d5a8e Fixed previous merge
0dd78d5a8e is described below
commit 0dd78d5a8ee75f7054a32140e4d6f7fd1c2fd123
Author: emmanuel lecharny <el...@apache.org>
AuthorDate: Thu Aug 22 10:49:44 2024 +0200
Fixed previous merge
---
i18n/src/main/java/org/apache/directory/server/i18n/I18n.java | 1 +
.../main/resources/org/apache/directory/server/i18n/errors.properties | 1 -
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/i18n/src/main/java/org/apache/directory/server/i18n/I18n.java b/i18n/src/main/java/org/apache/directory/server/i18n/I18n.java
index 3ed7ef72c3..fb02c2b8ba 100644
--- a/i18n/src/main/java/org/apache/directory/server/i18n/I18n.java
+++ b/i18n/src/main/java/org/apache/directory/server/i18n/I18n.java
@@ -580,6 +580,7 @@ public enum I18n
ERR_249("ERR_249"),
ERR_475("ERR_475"),
ERR_476("ERR_476"),
+ ERR_505("ERR_505"),
ERR_689("ERR_689"),
ERR_690("ERR_690"),
ERR_691("ERR_691"),
diff --git a/i18n/src/main/resources/org/apache/directory/server/i18n/errors.properties b/i18n/src/main/resources/org/apache/directory/server/i18n/errors.properties
index 80b066856b..ce51e79ca3 100644
--- a/i18n/src/main/resources/org/apache/directory/server/i18n/errors.properties
+++ b/i18n/src/main/resources/org/apache/directory/server/i18n/errors.properties
@@ -501,7 +501,6 @@ ERR_42003_CANNOT_COPY=Cannot copy non-existant source file {0}
ERR_42004_SHOULD_NOT_HIT_ROOT=Should not be hitting root without config/config pattern.
ERR_42005_PARENT_IS_NULL=parent cannot be null
-
# apacheds-server-integ errors 43000 - 43999
# apacheds-server-jndi errors 44000 - 44999
ERR_44000_COULD_NOT_GET_CANONICAL_PATH=could not get canonical path