Commit 4546f306 authored by Francis Dupont's avatar Francis Dupont
Browse files

[master] Fixed conflict in ChangeLog

parents 94226669 372506ca
1467. [doc] fdupont, tomek
Doxygen errors fixed.
(Gitlab #180,!93, git d12fb04d71c3b2d0e84ebb2c957334454b5705c4)
1466. [func] fdupont
Added random number generation in services provided by
the crypto library (and ultimately by the crypto backend,
......
......@@ -775,19 +775,23 @@ INPUT = ../src/bin/agent \
../src/bin/d2 \
../src/bin/dhcp4 \
../src/bin/dhcp6 \
../src/bin/lfc \
../src/bin/netconf \
../src/bin/perfdhcp \
../src/bin/sockcreator \
../src/bin/lfc \
../src/hooks/dhcp/high_availability \
../src/hooks/dhcp/user_chk \
../src/hooks/dhcp/lease_cmds \
../src/hooks/dhcp/stat_cmds \
../src/hooks/dhcp/user_chk \
../src/lib/asiodns \
../src/lib/asiolink \
../src/lib/cc \
../src/lib/cfgrpt \
../src/lib/config \
../src/lib/config_backend \
../src/lib/cql \
../src/lib/cryptolink \
../src/lib/database \
../src/lib/dhcp \
../src/lib/dhcp_ddns \
../src/lib/dhcpsrv \
......@@ -801,6 +805,8 @@ INPUT = ../src/bin/agent \
../src/lib/log \
../src/lib/log/compiler \
../src/lib/log/interprocess \
../src/lib/mysql \
../src/lib/pgsql \
../src/lib/process \
../src/lib/stats \
../src/lib/testutils \
......
......@@ -241,7 +241,7 @@ public:
}
/// @brief returns Kea version on stdout and exit.
/// redeclaration/redefinition. @ref Daemon::getVersion()
/// redeclaration/redefinition. @ref isc::process::Daemon::getVersion()
static std::string getVersion(bool extended);
/// @brief Main server processing loop.
......
// Copyright (C) 2012-2017 Internet Systems Consortium, Inc. ("ISC")
// Copyright (C) 2012-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
......@@ -84,9 +84,9 @@ databaseConfigConnect(const SrvConfigPtr& srv_cfg);
/// configuration.
///
/// @param srv_cfg Server configuration into which database configuration should be merged
/// @param mutable_cfg parsed configuration from the configuration file plus default values
/// @param mutable_cfg parsed configuration from the configuration file plus default values (ignored)
void
databaseConfigFetch(const SrvConfigPtr& srv_cfg, isc::data::ElementPtr /* mutable_cfg */);
databaseConfigFetch(const SrvConfigPtr& srv_cfg, isc::data::ElementPtr mutable_cfg);
}; // end of isc::dhcp namespace
}; // end of isc namespace
......
......@@ -97,7 +97,7 @@ public:
}
/// @brief returns Kea version on stdout and exit.
/// redeclaration/redefinition. @ref Daemon::getVersion()
/// redeclaration/redefinition. @ref isc::process::Daemon::getVersion()
static std::string getVersion(bool extended);
/// @brief Returns server-identifier option.
......
......@@ -72,7 +72,7 @@ public:
return (name_);
}
/// @Brief Returns value as string.
/// @brief Returns value as string.
std::string getValue() const {
return (value_);
}
......
......@@ -380,7 +380,7 @@ protected:
/// This method selects backends matching the selector. If the selector is
/// "unspecified" or there is no backend in the pool, an empty list is returned.
///
/// @param selector Selector for which matching backends should be selected.
/// @param backend_selector Selector for which matching backends should be selected.
std::list<ConfigBackendTypePtr>
selectBackends(const db::BackendSelector& backend_selector) const {
......
......@@ -69,7 +69,7 @@ BackendSelector::BackendSelector(const data::ConstElementPtr& access_map)
}
const BackendSelector&
BackendSelector::BackendSelector::UNSPEC() {
BackendSelector::UNSPEC() {
static BackendSelector selector;
return (selector);
}
......
......@@ -135,8 +135,8 @@ typedef boost::shared_ptr<ReconnectCtl> ReconnectCtlPtr;
/// connection with different types of databases; enables operations
/// on access parameters strings. In particular, it provides a way
/// to parse parameters in key=value format. This class is expected
/// to be a base class for all @ref LeaseMgr and possibly
/// @ref BaseHostDataSource derived classes.
/// to be a base class for all @ref isc::dhcp::LeaseMgr and possibly
/// @ref isc::dhcp::BaseHostDataSource derived classes.
class DatabaseConnection : public boost::noncopyable {
public:
......
......@@ -121,6 +121,8 @@ public:
/// @brief Retrieves single option by code and space.
///
/// @param server_selector Server selector.
/// @param code Option code.
/// @param space Option space.
/// @return Pointer to the retrieved option descriptor or null if
/// no option was found.
virtual OptionDescriptorPtr
......@@ -147,7 +149,7 @@ public:
/// @brief Retrieves global parameter value.
///
/// @param server_selector Server selector.
/// @param selector Server selector.
/// @param name Name of the global parameter to be retrieved.
/// @return Value of the global parameter or null if parameter doesn't
/// exist.
......@@ -162,6 +164,7 @@ public:
/// @brief Retrieves global parameters modified after specified time.
///
/// @param selector Server selector.
/// @param modification_time Modification time.
/// @return Collection of modified global parameters.
virtual data::StampedValueCollection
getModifiedGlobalParameters4(const db::ServerSelector& selector,
......
......@@ -142,6 +142,8 @@ public:
///
/// @param backend_selector Backend selector.
/// @param server_selector Server selector.
/// @param code Option code.
/// @param space Option space.
/// @return Pointer to the retrieved option descriptor or null if
/// no option was found.
virtual OptionDescriptorPtr
......@@ -287,7 +289,6 @@ public:
///
/// @param backend_selector Backend selector.
/// @param server_selector Server selector.
/// @param name Name of the global parameter.
/// @param value Value of the global parameter.
virtual void
createUpdateGlobalParameter4(const db::BackendSelector& backend_selector,
......
......@@ -156,7 +156,7 @@ public:
/// Creates a bind array to receive @ref Host data from the Cassandra
/// database. After data is successfully received, @ref retrieve() can be
/// called to retrieve the @ref Host object. Called in @ref
/// CqlExchange::executeSelect().
/// db::CqlExchange::executeSelect().
///
/// @param data array of objects representing data being retrieved
/// @param statement_tag prepared statement being executed; defaults to an
......@@ -1504,7 +1504,7 @@ protected:
/// @brief Retrieves a collection of hosts.
///
/// Calls @ref CqlExchange::executeSelect().
/// Calls @ref db::CqlExchange::executeSelect().
///
/// @param where_values array of bound objects used to filter the results
/// @param statement_tag prepared statement being executed
......@@ -1516,7 +1516,7 @@ protected:
/// @brief Inserts or deletes a single host.
///
/// All information is available here. Calls @ref
/// CqlExchange::executeMutation().
/// db::CqlExchange::executeMutation().
///
/// @param insert insert or delete a host
/// @param host @ref Host object from which options are retrieved and
......
......@@ -71,7 +71,7 @@ public:
/// - tcp-nodelay
///
/// For details regarding those paraemters, see
/// @ref isc::dhcp::CqlConnection::openDatabase.
/// @ref isc::db::CqlConnection::openDatabase.
///
/// Finally, all the CQL commands are pre-compiled.
///
......@@ -95,7 +95,7 @@ public:
/// The implementations of this method should guard against duplicate
/// reservations for the same @ref Host, where possible. For example, when
/// the reservation for the same @ref HWAddr and @ref SubnetID is added
/// twice, @ref add() should throw a @ref DuplicateEntry exception. Note,
/// twice, @ref add() should throw a @ref db::DuplicateEntry exception. Note,
/// that usually it is impossible to guard against adding duplicated @ref
/// Host, where one instance is identified by different identifier types.
///
......
......@@ -76,7 +76,7 @@
- <b>user</b> - database user ID under which the database is accessed. If not
specified, no user ID is used - the database is assumed to be open.
For details, see @ref isc::dhcp::MySqlConnection::openDatabase().
For details, see @ref isc::db::MySqlConnection::openDatabase().
@subsection dhcpdb-keywords-pgsql PostgreSQL connection string keywords
......@@ -89,7 +89,7 @@
- <b>user</b> - database user ID under which the database is accessed. If not
specified, no user ID is used - the database is assumed to be open.
For details, see @ref isc::dhcp::PgSqlConnection::openDatabase().
For details, see @ref isc::db::PgSqlConnection::openDatabase().
@subsection dhcpdb-keywords-cql Cassandra (CQL) connection string keywords
......@@ -103,7 +103,7 @@
- <b>keyspace</b> - an optional keyspace. If not specified, the default value
of 'keatest' will be used.
For details, see @ref isc::dhcp::CqlConnection::openDatabase().
For details, see @ref isc::db::CqlConnection::openDatabase().
@section dhcpdb-host Host Backends
......
......@@ -2035,7 +2035,7 @@ public:
/// @brief Check Error and Throw Exception
///
/// This method invokes @ref MySqlConnection::checkError.
/// This method invokes @ref db::MySqlConnection::checkError.
///
/// @param status Status code: non-zero implies an error
/// @param index Index of statement that caused the error
......
......@@ -754,7 +754,7 @@ public:
/// means no separator.
///
/// The following example use a binary MAC address 06:ce:8f:55:b3:33:
/// - <mac>, '-' => "06-ce-8f-55-b3-33"
/// - mac, '-' => "06-ce-8f-55-b3-33"
///
/// @throw EvalBadStack if there are less than 2 values on stack
///
......
......@@ -118,7 +118,7 @@ public:
/// @brief Acts as the receiver of new configurations.
///
/// This method is similar to what @ref parseConfig does, execept it employs
/// This method is similar to what parseConfig did, execept it employs
/// the simple parser paradigm: no intermediate storage, no parser pointers
/// no distinction between params_map and objects_map, parse order (if needed)
/// can be enforced in the actual implementation by calling specific
......
......@@ -114,7 +114,7 @@ public:
virtual ~DControllerBase();
/// @brief returns Kea version on stdout and exit.
/// redeclaration/redefinition. @ref isc::dhcp::Daemon::getVersion()
/// redeclaration/redefinition. @ref isc::process::Daemon::getVersion()
std::string getVersion(bool extended);
/// @brief Acts as the primary entry point into the controller execution
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment