[master] Finishing merge of trac5494 (Cassandra vs macOS)

diff --cc AUTHORS
Simple merge

diff --cc ChangeLog
index e4460f7036bb13338f68f5679192e48bd674bdae,08d36b4849bf4f0973c8a922fafde5fb8e1b7c4c..20a56252e3ac240865aa6de62fff99b99f1501ea
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,83 -1,3 +1,91 @@@
++1358. [build,bug]     fdupont
++      Cassandra build fixes for macOS.
++      (Trac #5494, git xxx)
++
++1357. [bug]           rcgoodfellow
++      Fixed bug in kea-admon causing error on lease-dump.
++      (github #61, git xxx)
++
 +1356. [func]          andreipavelQ,tomek
 +      The logging configuration is now applied early, which helps
 +      seeing errors in case the new configuration is faulty.
 +      (github #41, git d77fbec5a003a69cab207aa741133015f2657878)
 +
 +1355. [build]         andreipavelQ
 +      --with-dhcp-mysql renamed to --with-mysql and
 +      --with-dhcp-pgsql renamed to --with-pgsql. These names were
 +      leftovers from old BIND10 times when Kea was part of bigger
 +      solution that also provided DNS services. Kea is now a stand-alone
 +      software, thus the -dhcp- doesn't make sense in those options any
 +      more.
 +      (github #40, git 318c9e3d3db9bb938ced27932d8401172529a2ff)
 +
 +1354. [doc]           andreipavelQ
 +      Documentation has been upgraded to DocBook 5.0.
 +      (github #39, git 9b6705bd6c534128ec18820ff0cbdd72b7fce9e9)
 +
 +1353. [func]          tomek
 +      Lightweight 4over6 options reinstantiated. Definitions for DHCPv6
 +      options 89 through 96 were added back. DHCPv4 v4 Parameters Option
 +        159 has its definition tweaked slightly.
 +      (Trac #5514, git 6a4aac2b3bfffe41460db6d1cd3c55b1430aa50c)
 +
 +1352. [build]         andrei
 +      Support for coverage tests has been improved.
 +      (Github #43, git 1949bb3abf71fb3997044d239eb683095166c39f)
 +
 +1351. [build,bug]     andrei, razvan
 +      Various small changes and bugfixes. Thank you to Andrei Pavel
 +      and Razvan Becheriu for submitting their patch.
 +      (Github #54, git 2efa7494228a1797dff8d9d74107a452c61e2386)
 +
 +1350. [func]          fdupont
 +      It is now possible to specify client classification restrictions
 +      on per pool basis. This capability will be useful for grouping
 +      certain types of devices into specific address and/or prefix
 +      pools.
 +      (Trac #5425, git 5f3a89d6e32e90cd9cbb2347c7b2208c3e1561e0)
 +
 +1349. [build]         andreipavelQ
 +      Compilation parameters unified (every file now includes config.h,
 +      several makefile tweaks).
 +      (Github #38, git 7206aa79c57be7466c4ab3dd558663c6c4f858b7)
 +
 +1348. [func]          fdupont
 +      Several hook points now support next step status DROP. This allows
 +      more flexibility with dropping packets from within hooks.
 +      (Trac #5443, git ff22a906915a34df327174f550f69a396a05bb2c)
 +
 +1347. [func]          marcin
 +      Implemented HTTP client classes in libkea-http.
 +      (Trac #5451, git 94267e252b372650e4235389251b49d6f5501322)
 +
 +1346. [build]         fdupont
 +      Modified configure.ac to include premium module m4 macros, if the
 +      module is present. Prior to this it relied on premium having it's
 +      own configure.ac script.
 +      (Trac #5400, git 38c4f2fb8fc8c8874a0e4671cc295a049acf675f)
 +
 +1345. [build]         fdupont
 +      Added support of boost 1.66.0 ASIO.
 +      (Github #60/Trac #5496, git bc2947de4296bd99b74e50e65f272c7ad5312429)
 +
 +1344. [func]          marcin
 +      Implemented lease4-get-all command in lease_cmds hooks library.
 +      (Trac #5468, git a378ec28489e98df64830d1f26c3bebd20e256b2)
 +
 +1343. [func]          marcin
 +      Implemented "force-create" parameter for lease4-update and
 +      lease6-update commands.
 +      (Trac #5472, git 369245e4c5308a701fd483123f2cb2fd7d3d0966)
 +
 +1342. [func]          andrei, razvan
 +      Support for host reservations stored in Cassandra added. The core
 +      functionality was added. There are some limitations (delete,
 +      client classes, fixed DHCPv4 fields, statistics recount, etc.)
 +      These will be addressed in upcoming tickets.
 +      (github #37, git e37606fd2d0c02234a55f7445c52a12b2e7a82ec)
 +
  1343. [func]          fdupont
        User-context and comments are now supported in many new scopes:
        global, shared-network, subnet, pool, host reservation, option,

diff --cc doc/devel/unit-tests.dox
Simple merge

diff --cc doc/guide/install.xml
index c858cb7f762abfab7a0e83d87f376474b331b094,a520486a4edef3bc9cd23693160c681feddb794e..5cf88fb8f45a259b2c7a4c1c0ec981f031972686
--- 1/doc/guide/install.xml
--- 2/doc/guide/install.xml
+++ b/doc/guide/install.xml
@@@ -524,12 -518,12 +524,12 @@@ Debian and Ubuntu
          <para>
            Build and install Kea as described in <xref linkend="installation"/>, with
            the following modification. To enable the MySQL database code, at the
 -          "configure" step (see <xref linkend="configure"/>), the --with-dhcp-mysql switch
 +          "configure" step (see <xref linkend="configure"/>), the --with-mysql switch
            should be specified:
 -          <screen><userinput>./configure [other-options] --with-dhcp-mysql</userinput></screen>
 +          <screen><userinput>./configure [other-options] --with-mysql</userinput></screen>
-             If MySQL was not installed in the default location, the location of the MySQL
+               If MySQL was not installed in the default location, the location of the MySQL
            configuration program "mysql_config" should be included with the switch, i.e.
 -          <screen><userinput>./configure [other-options] --with-dhcp-mysql=<replaceable>path-to-mysql_config</replaceable></userinput></screen>
 +          <screen><userinput>./configure [other-options] --with-mysql=<replaceable>path-to-mysql_config</replaceable></userinput></screen>
          </para>
          <para>
            See <xref linkend="mysql-database-create"/> for details regarding
@@@ -546,12 -540,12 +546,12 @@@
          <para>
            Build and install Kea as described in <xref linkend="installation"/>, with
            the following modification. To enable the PostgreSQL database code, at the
 -          "configure" step (see <xref linkend="configure"/>), the --with-dhcp-pgsql switch
 +          "configure" step (see <xref linkend="configure"/>), the --with-pgsql switch
            should be specified:
 -          <screen><userinput>./configure [other-options] --with-dhcp-pgsql</userinput></screen>
 +          <screen><userinput>./configure [other-options] --with-pgsql</userinput></screen>
-             If PostgreSQL was not installed in the default location, the location of the PostgreSQL
+               If PostgreSQL was not installed in the default location, the location of the PostgreSQL
            configuration program "pg_config" should be included with the switch, i.e.
 -          <screen><userinput>./configure [other-options] --with-dhcp-pgsql=<replaceable>path-to-pg_config</replaceable></userinput></screen>
 +          <screen><userinput>./configure [other-options] --with-pgsql=<replaceable>path-to-pg_config</replaceable></userinput></screen>
          </para>
          <para>
            See <xref linkend="pgsql-database-create"/> for details regarding

diff --cc src/bin/admin/admin-utils.sh
index 33616d9a90852faca09e5a0cc4b2b104f63a771a,464cc22ab7d6f9bbb4349001e1f038e5fee81b44..2a9d4dccf8ffeefc2fb3f09ad68ef29279932961
--- 1/src/bin/admin/admin-utils.sh
--- 2/src/bin/admin/admin-utils.sh
+++ b/src/bin/admin/admin-utils.sh
@@@ -1,4 -1,4 +1,4 @@@
--# Copyright (C) 2014-2017 Internet Systems Consortium, Inc. ("ISC")
++# Copyright (C) 2014-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
@@@ -140,8 -126,9 +140,9 @@@ cql_execute_script() 
  }
  
  cql_version() {
 -  version=$(cql_execute "SELECT version, minor FROM schema_version" "$@")
 -  error=$?
 -  version=$(echo "$version" | grep -A 1 "+" | grep -v "+" | tr -d ' ' | cut -d "|" -f 1-2 | tr "|" ".")
 -  echo "$version"
 -  return $error
 +    version=$(cql_execute "SELECT version, minor FROM schema_version" "$@")
-     version=$(echo "$version" | grep -A 1 "+" | grep -v "+" | tr -d ' ' | cut -d "|" -f 1-2 --output-delimiter=".")
-     echo "${version}"
-     return $?
++    error=$?
++    version=$(echo "$version" | grep -A 1 "+" | grep -v "+" | tr -d ' ' | cut -d "|" -f 1-2 | tr "|" ".")
++    echo "$version"
++    return $error
  }

diff --cc src/lib/dhcpsrv/cql_lease_mgr.h
Simple merge

diff --cc src/share/database/scripts/cql/dhcpdb_create.cql
Simple merge