From 79a8669d6be5ac1fe2f1b62e3a48568200bd3148 Mon Sep 17 00:00:00 2001
From: gbellato <gbellato@localhost>
Date: Wed, 22 Aug 2007 07:36:24 +0000
Subject: [PATCH] issue 1804 : Ensure that conflicts are visible to administrators
---
opends/src/server/org/opends/server/util/ServerConstants.java | 19 +++++++++++++++++++
1 files changed, 19 insertions(+), 0 deletions(-)
diff --git a/opends/src/server/org/opends/server/util/ServerConstants.java b/opends/src/server/org/opends/server/util/ServerConstants.java
index 9ce1489..080dc21 100644
--- a/opends/src/server/org/opends/server/util/ServerConstants.java
+++ b/opends/src/server/org/opends/server/util/ServerConstants.java
@@ -2634,5 +2634,24 @@
* the SMTP server.
*/
public static final String SMTP_PROPERTY_PORT = "mail.smtp.port";
+
+
+ /**
+ * The description for the alert type that will be used for the alert
+ * notification generated if the multimaster replication detects
+ * a conflict that cannot be solved automatically.
+ */
+ public static final String ALERT_DESCRIPTION_REPLICATION_UNRESOLVED_CONFLICT =
+ "This alert type will be used to notify administrators if the " +
+ "multimaster replication cannot resolve automatically a conflict.";
+
+
+ /**
+ * The alert type string that will be used for the alert notification
+ * generated if the multimaster replication detects
+ * a conflict that cannot be solved automatically.
+ */
+ public static final String ALERT_TYPE_REPLICATION_UNRESOLVED_CONFLICT =
+ "org.opends.server.replication.UnresolvedConflict";
}
--
Gitblit v1.10.0