[master] pre-release *.mes files ordering

diff --git a/src/bin/agent/ca_messages.mes b/src/bin/agent/ca_messages.mes
index 409a36e3eea24402fdc94f78428207b75abc8344..de75ef8b1de8519182b4af18072782ec0757f283 100644 (file)
--- a/src/bin/agent/ca_messages.mes
+++ b/src/bin/agent/ca_messages.mes
@@ -1,4 +1,4 @@
-# Copyright (C) 2016-2017 Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2016-2018-2017 Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/src/bin/d2/d2_messages.mes b/src/bin/d2/d2_messages.mes
index 1cf9e63a4be7652656966186547cf0c19a2b861b..16e218ec52f02d10bc8289a4a641fd224e9027c8 100644 (file)
--- a/src/bin/d2/d2_messages.mes
+++ b/src/bin/d2/d2_messages.mes
@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2017 Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2013-2018 Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/src/bin/netconf/netconf_messages.mes b/src/bin/netconf/netconf_messages.mes
index c21ab1033cff3bc9aa720633167f5aec0fd7e0b3..054543086fa33d59854a2e882ad9b66d092c1311 100644 (file)
--- a/src/bin/netconf/netconf_messages.mes
+++ b/src/bin/netconf/netconf_messages.mes
@@ -10,15 +10,15 @@ $NAMESPACE isc::netconf
 This informational message is issued when the initial configuration
 was retrieved from Netconf and successfully applied to Kea server.
 
-% NETCONF_CONFIG_CHANGE_EVENT Received YANG configuration change %1 event
-This informational message is issued when Netconf receives a YANG
-configuration change event. The type of event is printed.
-
 % NETCONF_CONFIG_CHANGED_DETAIL YANG configuration changed: %1
 This debug message indicates a YANG configuration change. The format
 is the change operation (created, modified, deleted or moved) followed
 by xpaths and values of old and new nodes.
 
+% NETCONF_CONFIG_CHANGE_EVENT Received YANG configuration change %1 event
+This informational message is issued when Netconf receives a YANG
+configuration change event. The type of event is printed.
+
 % NETCONF_CONFIG_CHECK_FAIL Netconf configuration check failed: %1
 This error message indicates that Netconf had failed configuration
 check. Details are provided. Additional details may be available
@@ -86,6 +86,25 @@ The error message indicates that Netconf got an error subscribing
 configuration changes for a Kea server. The names of the server and
 the module, and the error are printed.
 
+% NETCONF_UPDATE_CONFIG updating configuration with %1 server: %2
+This debug message indicates that Netconf update the configuration
+of a Kea server. The server name and the updated configuration are
+printed.
+
+% NETCONF_UPDATE_CONFIG_COMPLETED completed updating configuration for %1 server
+This informational message indicates that Netconf updated with success the
+configuration of a Kea server.
+
+% NETCONF_UPDATE_CONFIG_FAILED updating configuration with %1 server: %2
+The error message indicates that Netconf got an error updating the
+configuration of a Kea server. This includes a configuration rejected
+by a Kea server when it tried to apply it. The name of the server and
+the error are printed.
+
+% NETCONF_UPDATE_CONFIG_STARTED started updating configuration for %1 server
+This informational message indicates that Netconf is trying to update the
+configuration of a Kea server.
+
 % NETCONF_VALIDATE_CONFIG validating configuration with %1 server: %2
 This debug message indicates that Netconf is validating the configuration
 with a Kea server. The server name and the validated configuration are
@@ -114,22 +133,3 @@ printed.
 % NETCONF_VALIDATE_CONFIG_STARTED started validating configuration for %1 server
 This informational message indicates that Netconf is trying to validate the
 configuration with a Kea server.
-
-% NETCONF_UPDATE_CONFIG updating configuration with %1 server: %2
-This debug message indicates that Netconf update the configuration
-of a Kea server. The server name and the updated configuration are
-printed.
-
-% NETCONF_UPDATE_CONFIG_COMPLETED completed updating configuration for %1 server
-This informational message indicates that Netconf updated with success the
-configuration of a Kea server.
-
-% NETCONF_UPDATE_CONFIG_FAILED updating configuration with %1 server: %2
-The error message indicates that Netconf got an error updating the
-configuration of a Kea server. This includes a configuration rejected
-by a Kea server when it tried to apply it. The name of the server and
-the error are printed.
-
-% NETCONF_UPDATE_CONFIG_STARTED started updating configuration for %1 server
-This informational message indicates that Netconf is trying to update the
-configuration of a Kea server.

diff --git a/src/hooks/dhcp/high_availability/ha_messages.mes b/src/hooks/dhcp/high_availability/ha_messages.mes
index cbb93f476bc7f62edcb0489519a80c0ec8f02ad0..9495ef715eb20567814825f15e9c9594d625d529 100644 (file)
--- a/src/hooks/dhcp/high_availability/ha_messages.mes
+++ b/src/hooks/dhcp/high_availability/ha_messages.mes
@@ -181,12 +181,6 @@ servers to resume the HA service.
 This informational message indicates that the High Availability hooks library
 has been loaded successfully.
 
-% HA_LEASES_SYNC_LEASE_PAGE_RECEIVED received %1 leases from %2
-This informational message is issued during lease database synchronization
-to indicate that a bulk of leases have been received. The first argument
-holds the count of leases received. The second argument specifies the
-partner server name.
-
 % HA_LEASES4_COMMITTED_FAILED leases4_committed callout failed: %1
 This error message is issued when the callout for the leases4_committed hook
 point failed. This includes unexpected errors like wrong arguments provided to
@@ -221,6 +215,12 @@ This error message is issued to indicate that there was a problem while
 parsing a response from the server from which leases have been fetched for
 local database synchronization. The argument contains a reason for the error.
 
+% HA_LEASES_SYNC_LEASE_PAGE_RECEIVED received %1 leases from %2
+This informational message is issued during lease database synchronization
+to indicate that a bulk of leases have been received. The first argument
+holds the count of leases received. The second argument specifies the
+partner server name.
+
 % HA_LEASE_SYNC_FAILED synchronization failed for lease: %1, reason: %2
 This warning message is issued when creating or updating a lease in the
 local lease database fails. The lease information in the JSON format is

diff --git a/src/lib/dhcpsrv/dhcpsrv_messages.mes b/src/lib/dhcpsrv/dhcpsrv_messages.mes
index 199381e6cc08f9737786857d183f3304f18d2b62..336f954b2f0ba0eba6a3bd9d87cbefa8ddba80c4 100644 (file)
--- a/src/lib/dhcpsrv/dhcpsrv_messages.mes
+++ b/src/lib/dhcpsrv/dhcpsrv_messages.mes
@@ -436,12 +436,6 @@ configuration. Due to lease-checks value, the lease will be loaded, but
 it will most likely be unused by Kea, as there is no subnet that matches
 the IP address associated with the lease.
 
-% DHCPSRV_LEASE_SANITY_FIXED The lease %1 with subnet-id %2 failed subnet-id checks, but was corrected to subnet-id %3.
-This informational message is printed when a lease was loaded, but had
-incorrect subnet-id value. The lease-checks parameter was set to a value
-that told Kea to try to correct the problem. There is a matching subnet,
-so Kea updated subnet-id and loaded the lease successfully.
-
 % DHCPSRV_LEASE_SANITY_FAIL_DISCARD The lease %1 with subnet-id %2 failed subnet-id checks and was dropped.
 This warning message is printed when a lease was loaded, but Kea was told
 (by setting lease-checks parameter) to discard leases with inconsistent
@@ -449,6 +443,12 @@ data. The lease was discarded, because either there is no subnet configured
 with matching subnet-id or the address of the lease does not belong to the
 subnet.
 
+% DHCPSRV_LEASE_SANITY_FIXED The lease %1 with subnet-id %2 failed subnet-id checks, but was corrected to subnet-id %3.
+This informational message is printed when a lease was loaded, but had
+incorrect subnet-id value. The lease-checks parameter was set to a value
+that told Kea to try to correct the problem. There is a matching subnet,
+so Kea updated subnet-id and loaded the lease successfully.
+
 % DHCPSRV_MEMFILE_ADD_ADDR4 adding IPv4 lease with address %1
 A debug message issued when the server is about to add an IPv4 lease
 with the specified address to the memory file backend database.
@@ -504,14 +504,6 @@ in the message.
 A debug message issued when the server is attempting to obtain all IPv4
 leases from the memory file database.
 
-% DHCPSRV_MEMFILE_GET_PAGE4 obtaining at most %1 IPv4 leases starting from address %2
-A debug message issued when the server is attempting to obtain a page
-of leases beginning with the specified address.
-
-% DHCPSRV_MEMFILE_GET_PAGE6 obtaining at most %1 IPv6 leases starting from address %2
-A debug message issued when the server is attempting to obtain a page
-of leases beginning with the specified address.
-
 % DHCPSRV_MEMFILE_GET6 obtaining all IPv6 leases
 A debug message issued when the server is attempting to obtain all IPv6
 leases from the memory file database.
@@ -563,6 +555,14 @@ A debug message issued when the server is attempting to obtain an IPv6
 lease from the memory file database for a client with the specified IAID
 (Identity Association ID), Subnet ID and DUID (DHCP Unique Identifier).
 
+% DHCPSRV_MEMFILE_GET_PAGE4 obtaining at most %1 IPv4 leases starting from address %2
+A debug message issued when the server is attempting to obtain a page
+of leases beginning with the specified address.
+
+% DHCPSRV_MEMFILE_GET_PAGE6 obtaining at most %1 IPv6 leases starting from address %2
+A debug message issued when the server is attempting to obtain a page
+of leases beginning with the specified address.
+
 % DHCPSRV_MEMFILE_GET_SUBID4 obtaining IPv4 leases for subnet ID %1
 A debug message issued when the server is attempting to obtain all IPv4
 leases for a given subnet identifier from the memory file database.
@@ -768,27 +768,19 @@ leases from the MySQL database.
 A debug message issued when the server is attempting to obtain an IPv4
 lease from the MySQL database for the specified address.
 
-% DHCPSRV_MYSQL_GET_PAGE4 obtaining at most %1 IPv4 leases starting from address %2
-A debug message issued when the server is attempting to obtain a page
-of leases beginning with the specified address.
-
-% DHCPSRV_MYSQL_GET_PAGE6 obtaining at most %1 IPv6 leases starting from address %2
-A debug message issued when the server is attempting to obtain a page
-of leases beginning with the specified address.
-
 % DHCPSRV_MYSQL_GET_ADDR6 obtaining IPv6 lease for address %1, lease type %2
 A debug message issued when the server is attempting to obtain an IPv6
 lease from the MySQL database for the specified address.
 
-% DHCPSRV_MYSQL_GET_DUID obtaining IPv6 lease for duid %1,
-A debug message issued when the server is attempting to obtain an IPv6
-lease from the MySQL database for the specified duid.
-
 % DHCPSRV_MYSQL_GET_CLIENTID obtaining IPv4 leases for client ID %1
 A debug message issued when the server is attempting to obtain a set
 of IPv4 leases from the MySQL database for a client with the specified
 client identification.
 
+% DHCPSRV_MYSQL_GET_DUID obtaining IPv6 lease for duid %1,
+A debug message issued when the server is attempting to obtain an IPv6
+lease from the MySQL database for the specified duid.
+
 % DHCPSRV_MYSQL_GET_EXPIRED4 obtaining maximum %1 of expired IPv4 leases
 A debug message issued when the server is attempting to obtain expired
 IPv4 leases to reclaim them. The maximum number of leases to be retrieved
@@ -814,6 +806,14 @@ A debug message issued when the server is attempting to obtain an IPv6
 lease from the MySQL database for a client with the specified IAID
 (Identity Association ID), Subnet ID and DUID (DHCP Unique Identifier).
 
+% DHCPSRV_MYSQL_GET_PAGE4 obtaining at most %1 IPv4 leases starting from address %2
+A debug message issued when the server is attempting to obtain a page
+of leases beginning with the specified address.
+
+% DHCPSRV_MYSQL_GET_PAGE6 obtaining at most %1 IPv6 leases starting from address %2
+A debug message issued when the server is attempting to obtain a page
+of leases beginning with the specified address.
+
 % DHCPSRV_MYSQL_GET_SUBID4 obtaining IPv4 leases for subnet ID %1
 A debug message issued when the server is attempting to obtain all IPv4
 leases for a given subnet identifier from the MySQL database.
@@ -961,6 +961,10 @@ A debug message issued when the server is attempting to obtain a set
 of IPv4 leases from the PostgreSQL database for a client with the specified
 client identification.
 
+% DHCPSRV_PGSQL_GET_DUID obtaining IPv6 leases for DUID %1,
+A debug message issued when the server is attempting to obtain a set of IPv6
+leases from the PostgreSQL database for a client with the specified DUID (DHCP Unique Identifier).
+
 % DHCPSRV_PGSQL_GET_EXPIRED4 obtaining maximum %1 of expired IPv4 leases
 A debug message issued when the server is attempting to obtain expired
 IPv4 leases to reclaim them. The maximum number of leases to be retrieved
@@ -981,10 +985,6 @@ A debug message issued when the server is attempting to obtain a set of IPv6
 leases from the PostgreSQL database for a client with the specified IAID
 (Identity Association ID) and DUID (DHCP Unique Identifier).
 
-% DHCPSRV_PGSQL_GET_DUID obtaining IPv6 leases for DUID %1,
-A debug message issued when the server is attempting to obtain a set of IPv6
-leases from the PostgreSQL database for a client with the specified DUID (DHCP Unique Identifier).
-
 % DHCPSRV_PGSQL_GET_IAID_SUBID_DUID obtaining IPv4 leases for IAID %1, Subnet ID %2, DUID %3, and lease type %4
 A debug message issued when the server is attempting to obtain an IPv6
 lease from the PostgreSQL database for a client with the specified IAID

diff --git a/src/lib/eval/eval_messages.mes b/src/lib/eval/eval_messages.mes
index 1bf42ed9f62f57e40d1e5216072f753637017ba9..0f37eaef6461648ac3a2ae53dfca58eca7af5f36 100644 (file)
--- a/src/lib/eval/eval_messages.mes
+++ b/src/lib/eval/eval_messages.mes
@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2017 Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2015-2018 Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this