[master] ChangeLog and dhcp6_messages reordered

diff --git a/ChangeLog b/ChangeLog
index 714bd0072930486781aebe7ab1a29e44410f46af..339d7912893f78b722eef1d750812dbeafabfc96 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,5 @@
+Kea 0.9.2 released on July 28, 2015
+
 988.   [bug]           fdupont
        keactrl no longer returns an error when the "status" command is
        issued and the Kea configuration file doesn't exist.
@@ -36,7 +38,7 @@
 981.   [bug]           tmark
        keactrl now uses PID files to identify and control server instances.
        Prior to this it relied on the system command, "ps", which could lead
-       to it misinterperting which processes are or are not running.
+       to it misinterpreting which processes are or are not running.
        (Trac #3939, git 93a720ed7ffdffe66bd835cd64f78e4ad601637a)
 
 980.   [doc]           marcin
@@ -88,18 +90,18 @@
        options for both DHCPv4 and DHCPv6.
        (Trac #3846, git 6aebe0867ca9cf6fb09a289d80051125db7fa34b)
 
-971.   [bug]           marcin
-       DHCPv6 server extends the lifetime of the client's lease
-       in the database when the client sends the Request message.
-       This prevents premature lease expiration before the client
-       renews the lease, according to the timers and lifetimes
-       returned by the server.
-       (Trac #3913, git 1d64829a3f1a8288dc833ed388d9ffc9fe4cf491)
+971.   [func]          fdupont
+       Changed all occurrences of unlink() to the more portable remove()
+       to avoid problems on operating systems where the former is not
+       available.
+       (Trac #3841, git 3752529ed3d72137f6899ef8225a0b231db5b1f0)
 
 970.   [bug]           fdupont
        Refactored some code to suppress cppcheck warnings.
        (Trac #3919, git 26be6ac4cefde012ca8ef12607b6beaadca13eed)
 
+Kea 0.9.2-beta released on June 30, 2015
+
 969.   [func]          tomek
        KEA_SOCKET_TEST_DIR environment variable can be used to specify
        the directory for opening Unix sockets during tests. That may
@@ -107,11 +109,13 @@
        in deeply nested directories.
        (Trac #3918, git 9cfd502e8d4605eaf34f8744f90272dc3e8a3e34)
 
-968.   [func]          fdupont
-       Changed all occurrences of unlink() to the more portable remove()
-       to avoid problems on operating systems where the former is not
-       available.
-       (Trac #3841, git 3752529ed3d72137f6899ef8225a0b231db5b1f0)
+968.   [bug]           marcin
+       DHCPv6 server extends the lifetime of the client's lease
+       in the database when the client sends the Request message.
+       This prevents premature lease expiration before the client
+       renews the lease, according to the timers and lifetimes
+       returned by the server.
+       (Trac #3913, git 1d64829a3f1a8288dc833ed388d9ffc9fe4cf491)
 
 967.   [doc]           tomek
        Management API section added in the DHCPv6 chapter of the Kea

diff --git a/src/bin/dhcp6/dhcp6_messages.mes b/src/bin/dhcp6/dhcp6_messages.mes
index d0d7aa15ecba8e44515a42538fc82359b2bbc1a3..5b62bb73bc72118b438ddc26e0fda0c48a93074c 100644 (file)
--- a/src/bin/dhcp6/dhcp6_messages.mes
+++ b/src/bin/dhcp6/dhcp6_messages.mes
@@ -19,17 +19,6 @@ This message is printed when DHCPv6 server enabled an interface to be used
 to receive DHCPv6 traffic. IPv6 socket on this interface will be opened once
 Interface Manager starts up procedure of opening sockets.
 
-% DHCP6_ALREADY_RUNNING %1 already running? %2
-This is an error message that occurs when the DHCPv6 server encounters
-a pre-existing PID file which contains the PID of a running process.
-This most likely indicates an attempt to start a second instance of
-the server using the same configuration file.  It is possible, though
-unlikely that the PID file is a remnant left behind by a server crash or
-power failure and the PID it contains refers to a process other than
-the server.  In such an event, it would be necessary to manually remove
-the PID file.  The first argument is the DHCPv6 process name, the second
-contains the PID and PID file.
-
 % DHCP6_ADD_GLOBAL_STATUS_CODE %1: adding Status Code to DHCPv6 packet: %2
 This message is logged when the server is adding the top-level
 Status Code option. The first argument includes the client and the
@@ -42,6 +31,17 @@ option to an IA. The first argument includes the client and the
 transaction identification information. The second argument specifies
 the IAID. The third argument includes the details of the status code.
 
+% DHCP6_ALREADY_RUNNING %1 already running? %2
+This is an error message that occurs when the DHCPv6 server encounters
+a pre-existing PID file which contains the PID of a running process.
+This most likely indicates an attempt to start a second instance of
+the server using the same configuration file.  It is possible, though
+unlikely that the PID file is a remnant left behind by a server crash or
+power failure and the PID it contains refers to a process other than
+the server.  In such an event, it would be necessary to manually remove
+the PID file.  The first argument is the DHCPv6 process name, the second
+contains the PID and PID file.
+
 % DHCP6_BUFFER_RECEIVED received buffer from %1:%2 to %3:%4 over interface %5
 This debug message is logged when the server has received a packet
 over the socket. When the message is logged the contents of the received