diff options
| -rw-r--r-- | configure.ac | 10 | ||||
| -rw-r--r-- | platforms.rst | 2 | ||||
| -rw-r--r-- | src/lib/cc/command_interpreter.cc | 2 | ||||
| -rw-r--r-- | src/share/database/scripts/mysql/dhcpdb_create.mysql | 2 | ||||
| -rw-r--r-- | src/share/database/scripts/mysql/upgrade_015_to_016.sh.in | 2 | ||||
| -rw-r--r-- | src/share/database/scripts/pgsql/dhcpdb_create.pgsql | 2 | ||||
| -rw-r--r-- | src/share/database/scripts/pgsql/upgrade_014_to_015.sh.in | 2 |
7 files changed, 6 insertions, 16 deletions
diff --git a/configure.ac b/configure.ac index b1d665f7d8..797d7ddaa8 100644 --- a/configure.ac +++ b/configure.ac @@ -850,16 +850,6 @@ if test "${pgsql_ssl}" = "yes"; then AC_DEFINE([HAVE_PGSQL_SSL], [1], [PostgreSQL was built with OpenSSL support]) fi -cql_config="no" -AC_ARG_WITH([cql], - [AS_HELP_STRING([--with-cql[[=PATH]]], - [path to pkg-config or the Cassandra CQL 'cql_config' script (deprecated)])], - [cql_config="$withval"]) - -if test "${cql_config}" != "no" ; then - AC_MSG_ERROR([$CQL_CONFIG Cassandra is no longer supported]) -fi - # Check for log4cplus DISTCHECK_LOG4CPLUS_CONFIGURE_FLAG= log4cplus_path="yes" diff --git a/platforms.rst b/platforms.rst index 6958dd810f..926e3c394a 100644 --- a/platforms.rst +++ b/platforms.rst @@ -20,7 +20,7 @@ Regularly Tested Platforms Kea is officially supported on Alpine, CentOS, Fedora, Ubuntu, Debian, and FreeBSD systems. Kea-|release| builds have been tested on: -* Alpine — 3.14, 3.15, 3.16 +* Alpine — 3.14, 3.15, 3.16, 3.17 * CentOS — 7 * Debian — 10, 11 * Fedora — 36 diff --git a/src/lib/cc/command_interpreter.cc b/src/lib/cc/command_interpreter.cc index 1bdd329d19..be7048e7db 100644 --- a/src/lib/cc/command_interpreter.cc +++ b/src/lib/cc/command_interpreter.cc @@ -220,7 +220,7 @@ parseCommandWithArgs(ConstElementPtr& arg, ConstElementPtr command) { // Arguments must be a map. if (arg->getType() != Element::map) { isc_throw(CtrlChannelError, - "invalid command '" << command_name << "': expected " + "invalid command '" << command_name << "': expected '" << CONTROL_ARGUMENTS << "' to be a map, got " << Element::typeToName(arg->getType()) << " instead"); } diff --git a/src/share/database/scripts/mysql/dhcpdb_create.mysql b/src/share/database/scripts/mysql/dhcpdb_create.mysql index d6784e13ae..b0b60b6651 100644 --- a/src/share/database/scripts/mysql/dhcpdb_create.mysql +++ b/src/share/database/scripts/mysql/dhcpdb_create.mysql @@ -5091,7 +5091,7 @@ UPDATE schema_version -- This line starts the schema upgrade to version 16. --- Add relay and remote id colums to DHCPv4 leases. +-- Add relay and remote id columns to DHCPv4 leases. -- -- Note: these columns are only used for indexes, in particular they are -- not exported by lease4 dump as values are also in the user context diff --git a/src/share/database/scripts/mysql/upgrade_015_to_016.sh.in b/src/share/database/scripts/mysql/upgrade_015_to_016.sh.in index 05e0396162..fe89202c76 100644 --- a/src/share/database/scripts/mysql/upgrade_015_to_016.sh.in +++ b/src/share/database/scripts/mysql/upgrade_015_to_016.sh.in @@ -54,7 +54,7 @@ fi mysql "$@" <<EOF -- This line starts the schema upgrade to version 16. --- Add relay and remote id colums to DHCPv4 leases. +-- Add relay and remote id columns to DHCPv4 leases. -- -- Note: these columns are only used for indexes, in particular they are -- not exported by lease4 dump as values are also in the user context diff --git a/src/share/database/scripts/pgsql/dhcpdb_create.pgsql b/src/share/database/scripts/pgsql/dhcpdb_create.pgsql index e4d3f53155..f172b5169c 100644 --- a/src/share/database/scripts/pgsql/dhcpdb_create.pgsql +++ b/src/share/database/scripts/pgsql/dhcpdb_create.pgsql @@ -5651,7 +5651,7 @@ UPDATE schema_version -- This line starts the schema upgrade to version 15. --- Add relay and remote id colums to DHCPv4 leases. +-- Add relay and remote id columns to DHCPv4 leases. -- -- Note: these columns are only used for indexes, in particular they are -- not exported by lease4 dump as values are also in the user context diff --git a/src/share/database/scripts/pgsql/upgrade_014_to_015.sh.in b/src/share/database/scripts/pgsql/upgrade_014_to_015.sh.in index 2681e6c579..420e07f5b4 100644 --- a/src/share/database/scripts/pgsql/upgrade_014_to_015.sh.in +++ b/src/share/database/scripts/pgsql/upgrade_014_to_015.sh.in @@ -38,7 +38,7 @@ START TRANSACTION; -- This line starts the schema upgrade to version 15. --- Add relay and remote id colums to DHCPv4 leases. +-- Add relay and remote id columns to DHCPv4 leases. -- -- Note: these columns are only used for indexes, in particular they are -- not exported by lease4 dump as values are also in the user context |