From f122db289e310a76292e78236cfa66387d38ce5d Mon Sep 17 00:00:00 2001 From: Wlodek Wencel Date: Thu, 25 Jul 2024 10:00:45 +0200 Subject: [PATCH] [#3512] release changes --- ChangeLog | 2 ++ configure.ac | 2 +- src/hooks/dhcp/mysql_cb/tests/mysql_cb_dhcp4_unittest.cc | 2 +- src/hooks/dhcp/mysql_cb/tests/mysql_cb_dhcp6_unittest.cc | 2 +- src/hooks/dhcp/pgsql_cb/tests/pgsql_cb_dhcp4_unittest.cc | 2 +- src/hooks/dhcp/pgsql_cb/tests/pgsql_cb_dhcp6_unittest.cc | 2 +- src/lib/dhcpsrv/tests/cfgmgr_unittest.cc | 2 +- src/lib/dhcpsrv/testutils/generic_cb_dhcp4_unittest.h | 2 +- src/share/database/scripts/mysql/dhcpdb_drop.mysql | 2 +- src/share/database/scripts/pgsql/dhcpdb_drop.pgsql | 2 +- 10 files changed, 11 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index d42d6c9aa0..50a8808fd9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,5 @@ +Kea 2.6.1 (stable) released on July 31, 2024 + 2252. [bug] tmark, razvan Corrected an issue in MySQL config back end that causes preferred life time values to be overwritten diff --git a/configure.ac b/configure.ac index bdabddbb6f..cc1b31af71 100644 --- a/configure.ac +++ b/configure.ac @@ -6,7 +6,7 @@ AC_PREREQ([2.69]) # For released versions, this is in x.y.z format. # For GIT versions, this is x.y.z-git, where x.y.z denotes the next development # version that is worked on and that is to be released. -AC_INIT(kea, 2.6.0-git, kea-dev@lists.isc.org) +AC_INIT(kea, 2.6.1-git, kea-dev@lists.isc.org) AC_CONFIG_SRCDIR(README) # serial-tests is not available in automake version before 1.13, so diff --git a/src/hooks/dhcp/mysql_cb/tests/mysql_cb_dhcp4_unittest.cc b/src/hooks/dhcp/mysql_cb/tests/mysql_cb_dhcp4_unittest.cc index 72b873451c..bb418b5296 100644 --- a/src/hooks/dhcp/mysql_cb/tests/mysql_cb_dhcp4_unittest.cc +++ b/src/hooks/dhcp/mysql_cb/tests/mysql_cb_dhcp4_unittest.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2018-2022 Internet Systems Consortium, Inc. ("ISC") +// Copyright (C) 2018-2024 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/hooks/dhcp/mysql_cb/tests/mysql_cb_dhcp6_unittest.cc b/src/hooks/dhcp/mysql_cb/tests/mysql_cb_dhcp6_unittest.cc index d758b54e05..3580dfa6e7 100644 --- a/src/hooks/dhcp/mysql_cb/tests/mysql_cb_dhcp6_unittest.cc +++ b/src/hooks/dhcp/mysql_cb/tests/mysql_cb_dhcp6_unittest.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2019-2022 Internet Systems Consortium, Inc. ("ISC") +// Copyright (C) 2019-2024 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/hooks/dhcp/pgsql_cb/tests/pgsql_cb_dhcp4_unittest.cc b/src/hooks/dhcp/pgsql_cb/tests/pgsql_cb_dhcp4_unittest.cc index aa80e1a61d..ea968e75ef 100644 --- a/src/hooks/dhcp/pgsql_cb/tests/pgsql_cb_dhcp4_unittest.cc +++ b/src/hooks/dhcp/pgsql_cb/tests/pgsql_cb_dhcp4_unittest.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2021-2022 Internet Systems Consortium, Inc. ("ISC") +// Copyright (C) 2021-2024 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/hooks/dhcp/pgsql_cb/tests/pgsql_cb_dhcp6_unittest.cc b/src/hooks/dhcp/pgsql_cb/tests/pgsql_cb_dhcp6_unittest.cc index c1720587f1..df80329638 100644 --- a/src/hooks/dhcp/pgsql_cb/tests/pgsql_cb_dhcp6_unittest.cc +++ b/src/hooks/dhcp/pgsql_cb/tests/pgsql_cb_dhcp6_unittest.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2022 Internet Systems Consortium, Inc. ("ISC") +// Copyright (C) 2022-2024 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/lib/dhcpsrv/tests/cfgmgr_unittest.cc b/src/lib/dhcpsrv/tests/cfgmgr_unittest.cc index 13ec6a1147..44699638f3 100644 --- a/src/lib/dhcpsrv/tests/cfgmgr_unittest.cc +++ b/src/lib/dhcpsrv/tests/cfgmgr_unittest.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2012-2023 Internet Systems Consortium, Inc. ("ISC") +// Copyright (C) 2012-2024 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/lib/dhcpsrv/testutils/generic_cb_dhcp4_unittest.h b/src/lib/dhcpsrv/testutils/generic_cb_dhcp4_unittest.h index 456d6a3aeb..4375cb426d 100644 --- a/src/lib/dhcpsrv/testutils/generic_cb_dhcp4_unittest.h +++ b/src/lib/dhcpsrv/testutils/generic_cb_dhcp4_unittest.h @@ -1,4 +1,4 @@ -// Copyright (C) 2022 Internet Systems Consortium, Inc. ("ISC") +// Copyright (C) 2022-2024 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/share/database/scripts/mysql/dhcpdb_drop.mysql b/src/share/database/scripts/mysql/dhcpdb_drop.mysql index 82881efb0f..919f7c7887 100644 --- a/src/share/database/scripts/mysql/dhcpdb_drop.mysql +++ b/src/share/database/scripts/mysql/dhcpdb_drop.mysql @@ -1,4 +1,4 @@ -# Copyright (C) 2016-2023 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2016-2024 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/share/database/scripts/pgsql/dhcpdb_drop.pgsql b/src/share/database/scripts/pgsql/dhcpdb_drop.pgsql index 9334e6235e..c644898d08 100644 --- a/src/share/database/scripts/pgsql/dhcpdb_drop.pgsql +++ b/src/share/database/scripts/pgsql/dhcpdb_drop.pgsql @@ -1,4 +1,4 @@ --- Copyright (C) 2016-2023 Internet Systems Consortium. +-- Copyright (C) 2016-2024 Internet Systems Consortium. -- 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 -- 2.47.2