GitLab

src/lib/dhcpsrv/host_data_source_factory.cc
    HostDataSourceFactory::create(const std::string& dbaccess)
        - Removed logging from exception throwing conditions
        - Minor clean up of the method itself

src/lib/dhcpsrv/dhcpsrv_messages.mes
    Removed obsoleted error messages:
        DHCPSRV_HOSTDB_NOTYPE
        DHCPSRV_UNKNOWN_HOST_DB

src/lib/dhcpsrv/dhcpsrv_messages.mes
    Added hosts database specific messages

src/lib/dhcpsrv/host_data_source_factory.cc
src/lib/dhcpsrv/mysql_host_data_source.cc
    Updated log statements with hosts database messages

Conflicts:
	ChangeLog

The use of .text isn't really clear yet and rather than confuse
users we are removing it from the documentation.

 - Includes fix in AllocEngine6Test ctor, provided by Thomas

# Conflicts:
#	src/lib/dhcp/libdhcp++.cc
#	src/lib/dhcp/libdhcp++.h

This is a workaround for a GCC bug which affects gcc 4.4 and
manifests on RHEL6.3 as a build failure. This fix was okayed
on jabber.

    Merged in branch 'trac3702'

doc/guide/kea-logo-100x70.png
	new file, it it the Kea logo with the bird's head only

doc/Doxyfile
    Changed PROJECT_LOGO to use use new Kea logo

doc/Makefile.am
    Added logo file to dist_html_DATA so it will be installed

doc/guide/kea-guide.xml
    Added logo as inlinemedia object to the title

Two nits.