From: Tomek Mrugalski <tomasz@isc.org>
Date: Fri, 10 Feb 2017 17:47:03 +0000 (+0100)
Subject: [master] Merge branch github47 (typos)
X-Git-Tag: trac3590_base~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=27956d95a36faf8d2b9f1ea68ac4d8466e0768a5;p=thirdparty%2Fkea.git

[master] Merge branch github47 (typos)

# Conflicts:
#	src/bin/dhcp4/json_config_parser.cc
#	src/bin/dhcp4/tests/fqdn_unittest.cc
#	src/bin/dhcp6/dhcp6_srv.h
#	src/bin/dhcp6/tests/fqdn_unittest.cc
#	src/lib/config/command_mgr.h
#	src/lib/dhcpsrv/alloc_engine.h
#	src/lib/dhcpsrv/parsers/client_class_def_parser.h
#	src/lib/dhcpsrv/parsers/dbaccess_parser.cc
#	src/lib/dhcpsrv/parsers/dhcp_parsers.cc
#	src/lib/dhcpsrv/parsers/dhcp_parsers.h
#	src/lib/dhcpsrv/srv_config.h
#	src/lib/dhcpsrv/tests/client_class_def_parser_unittest.cc
#	src/lib/dhcpsrv/tests/dhcp_parsers_unittest.cc
#	src/lib/eval/eval_context.h
#	src/lib/hooks/callout_manager.cc
#	src/lib/testutils/dhcp_test_lib.sh.in
---

27956d95a36faf8d2b9f1ea68ac4d8466e0768a5
diff --cc src/bin/dhcp4/tests/kea_controller_unittest.cc
index 44109d1852,a163ed409a..22450bf383
--- a/src/bin/dhcp4/tests/kea_controller_unittest.cc
+++ b/src/bin/dhcp4/tests/kea_controller_unittest.cc
@@@ -534,9 -347,9 +534,9 @@@ TEST_F(JSONFileBackendTest, timers) 
          "\"subnet4\": [ ],"
          "\"valid-lifetime\": 4000 }"
          "}";
 -    writeFile(config);
 +    writeFile(TEST_FILE, config);
  
-     // Create an instance of the server and intialize it.
+     // Create an instance of the server and initialize it.
      boost::scoped_ptr<ControlledDhcpv4Srv> srv;
      ASSERT_NO_THROW(srv.reset(new ControlledDhcpv4Srv(0)));
      ASSERT_NO_THROW(srv->init(TEST_FILE));
@@@ -603,9 -416,9 +603,9 @@@ TEST_F(JSONFileBackendTest, defaultLeas
          "\"subnet4\": [ ],"
          "\"valid-lifetime\": 4000 }"
          "}";
 -    writeFile(config);
 +    writeFile(TEST_FILE, config);
  
-     // Create an instance of the server and intialize it.
+     // Create an instance of the server and initialize it.
      boost::scoped_ptr<ControlledDhcpv4Srv> srv;
      ASSERT_NO_THROW(srv.reset(new ControlledDhcpv4Srv(0)));
      ASSERT_NO_THROW(srv->init(TEST_FILE));
@@@ -705,9 -518,9 +705,9 @@@ voi
  JSONFileBackendMySQLTest::
  testBackendReconfiguration(const std::string& backend_first,
                             const std::string& backend_second) {
 -    writeFile(createConfiguration(backend_first));
 +    writeFile(TEST_FILE, createConfiguration(backend_first));
  
-     // Create an instance of the server and intialize it.
+     // Create an instance of the server and initialize it.
      boost::scoped_ptr<NakedControlledDhcpv4Srv> srv;
      ASSERT_NO_THROW(srv.reset(new NakedControlledDhcpv4Srv()));
      srv->setConfigFile(TEST_FILE);
diff --cc src/lib/dhcpsrv/parsers/host_reservation_parser.h
index 4087401ea3,0c10e9082f..beef6de00c
--- a/src/lib/dhcpsrv/parsers/host_reservation_parser.h
+++ b/src/lib/dhcpsrv/parsers/host_reservation_parser.h
@@@ -146,9 -149,9 +146,9 @@@ protected
  /// @brief Parser for a list of host identifiers.
  ///
  /// This is a parent parser class for parsing "host-reservation-identifiers"
- /// global configuration parmeter. The DHCPv4 and DHCPv6 specific parsers
+ /// global configuration parameter. The DHCPv4 and DHCPv6 specific parsers
  /// derive from this class.
 -class HostReservationIdsParser : public DhcpConfigParser {
 +class HostReservationIdsParser : public isc::data::SimpleParser {
  public:
  
      /// @brief Constructor.
diff --cc src/lib/dhcpsrv/pgsql_connection.h
index ad82de7bb5,f242f1f3f6..b2749cd439
--- a/src/lib/dhcpsrv/pgsql_connection.h
+++ b/src/lib/dhcpsrv/pgsql_connection.h
@@@ -62,9 -57,10 +62,9 @@@ const size_t OID_INT4 = 23;  // 4 byte 
  const size_t OID_TEXT = 25;
  const size_t OID_VARCHAR = 1043;
  const size_t OID_TIMESTAMP = 1114;
 -
 -//@}
 +///@}
  
- /// @brief RAII wrapper for Posgtresql Result sets
+ /// @brief RAII wrapper for PostgreSQL Result sets
  ///
  /// When a Postgresql statement is executed, the results are returned
  /// in pointer allocated structure, PGresult*. Data and status information
diff --cc src/lib/dhcpsrv/pgsql_lease_mgr.cc
index 05ff6a3ee8,82905a4fdc..9f4c6e0cc8
--- a/src/lib/dhcpsrv/pgsql_lease_mgr.cc
+++ b/src/lib/dhcpsrv/pgsql_lease_mgr.cc
@@@ -818,12 -819,14 +818,14 @@@ PgSqlLeaseMgr::PgSqlLeaseMgr(const Data
                    << " does not match expected count:" << NUM_STATEMENTS);
      }
  
 -    pair<uint32_t, uint32_t> code_version(PG_CURRENT_VERSION, PG_CURRENT_MINOR);
 +    pair<uint32_t, uint32_t> code_version(PG_SCHEMA_VERSION_MAJOR, PG_SCHEMA_VERSION_MINOR);
      pair<uint32_t, uint32_t> db_version = getVersion();
      if (code_version != db_version) {
-         isc_throw(DbOpenError, "Posgresql schema version mismatch: need version: "
-                   << code_version.first << "." << code_version.second
-                   << " found version:  " << db_version.first << "." << db_version.second);
+         isc_throw(DbOpenError,
+                   "PostgreSQL schema version mismatch: need version: "
+                       << code_version.first << "." << code_version.second
+                       << " found version:  " << db_version.first << "."
+                       << db_version.second);
      }
  }