From d04fb0f282e0fd9a4bc80d3f9d5ee15506a3b83b Mon Sep 17 00:00:00 2001 From: gbellato <gbellato@localhost> Date: Mon, 08 Dec 2008 08:03:33 +0000 Subject: [PATCH] Merge the replication-service branch with the OpenDS trunk --- opends/src/messages/messages/replication.properties | 19 ++++++++++++++++--- 1 files changed, 16 insertions(+), 3 deletions(-) diff --git a/opends/src/messages/messages/replication.properties b/opends/src/messages/messages/replication.properties index d405c94..b519ed2 100644 --- a/opends/src/messages/messages/replication.properties +++ b/opends/src/messages/messages/replication.properties @@ -109,8 +109,9 @@ connection SEVERE_ERR_WRITER_UNEXPECTED_EXCEPTION_32=An unexpected error happened \ handling connection with %s. This connection is going to be closed -SEVERE_ERR_CHANGELOG_ERROR_SENDING_ACK_33=An unexpected error occurred while \ - sending an ack to %s. This connection is going to be closed and reopened +SEVERE_ERR_RS_ERROR_SENDING_ACK_33=In replication server %s: an unexpected error \ + occurred while sending an ack to server id %s for change number %s in domain %s \ + . This connection is going to be closed and reopened SEVERE_ERR_EXCEPTION_RECEIVING_REPLICATION_MESSAGE_34=An Exception was caught \ while receiving replication message : %s MILD_ERR_LOOP_REPLAYING_OPERATION_35=A loop was detected while replaying \ @@ -269,7 +270,7 @@ DEBUG_SENDING_CHANGE_112=Sending change number: %s DEBUG_CHANGES_SENT_113=All missing changes sent to replication server SEVERE_ERR_PUBLISHING_FAKE_OPS_114=Caught exception publishing fake operations \ -for domain %s to replication server %s : %s +for domain %s : %s SEVERE_ERR_COMPUTING_FAKE_OPS_115=Caught exception computing fake operations \ for domain %s for replication server %s : %s NOTICE_IGNORING_REMOTE_MONITOR_DATA_116=Some monitor data have been received \ @@ -346,3 +347,15 @@ server %s will be aborted. Simultanate cross connection attempt ? NOTICE_BAD_GENERATION_ID_FROM_DS_146=On suffix %s, directory server %s presented \ generation ID=%s when expected generation ID=%s +SEVERE_ERR_DS_RECEIVED_ACK_ERROR_147=In replication service %s, the assured \ + update message %s was acknowledged with the following errors: %s +SEVERE_ERR_DS_ACK_TIMEOUT_148=In replication service %s, timeout after %s ms \ + waiting for the acknowledgement of the assured update message: %s +SEVERE_ERR_DS_UNKNOWN_ASSURED_MODE_149=In directory server %s, received unknown \ + assured update mode: %s, for domain %s. Message: %s +SEVERE_ERR_RS_UNKNOWN_ASSURED_MODE_150=In replication server %s, received unknown \ + assured update mode: %s, for domain %s. Message: %s +SEVERE_ERR_UNKNOWN_ASSURED_SAFE_DATA_LEVEL_151=In replication server %s, \ + received a safe data assured update message with incoherent level: %s, this is \ + for domain %s. Message: %s + -- Gitblit v1.10.0