From: Thomas Markwalder Date: Tue, 17 Dec 2013 16:50:33 +0000 (-0500) Subject: Merge branch 'trac3088' (adds d2::NameRemoveTransaction) X-Git-Tag: bind10-1.2.0beta1-release~173 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ca58ac00fce4cb5f46e534d7ffadb2db4e4ffaf3;p=thirdparty%2Fkea.git Merge branch 'trac3088' (adds d2::NameRemoveTransaction) Conflicts: src/bin/d2/d2_messages.mes --- ca58ac00fce4cb5f46e534d7ffadb2db4e4ffaf3 diff --cc src/bin/d2/d2_messages.mes index c0370ea45e,a5bd5ec706..d4ab054e0a --- a/src/bin/d2/d2_messages.mes +++ b/src/bin/d2/d2_messages.mes @@@ -331,7 -331,7 +331,7 @@@ the server bound packet requesting a fo to invalid data contained in the NameChangeRequest. The request will be aborted. This is most likely a configuration issue. - % DHCP_DDNS_FORWARD_REPLACE_BUILD_FAILURE A DNS update message to replace a forward DNS entry could not be constructed from this request: %1, reason: %2 -% DHCP_DDNS_FORWARD_REPLACE_BUILD_FAILURE DNS update message to replace a foward DNS entry could not be constructed from this request: %1, reason: %2 ++% DHCP_DDNS_FORWARD_REPLACE_BUILD_FAILURE DNS update message to replace a forward DNS entry could not be constructed from this request: %1, reason: %2 This is an error message issued when an error occurs attempting to construct the server bound packet requesting a forward address replacement. This is due to invalid data contained in the NameChangeRequest. The request will be