]> git.ipfire.org Git - thirdparty/kea.git/commitdiff
[#101,!58] Rebased for merge 101-cb-add-two-step-configuration-to-the-dhcpv4-server
authorThomas Markwalder <tmark@isc.org>
Fri, 12 Oct 2018 13:24:49 +0000 (09:24 -0400)
committerThomas Markwalder <tmark@isc.org>
Fri, 12 Oct 2018 13:24:49 +0000 (09:24 -0400)
modified:   AUTHORS
    modified:   doc/guide/netconf.xml
modified:   src/bin/netconf/netconf_controller.cc
modified:   src/bin/netconf/netconf_controller.h
modified:   src/lib/process/Makefile.am
deleted:    src/share/database/scripts/mysql/dhcpdb_create.mysql.orig
deleted:    src/share/database/scripts/mysql/upgrade_6.0_to_7.0.sh.in.orig


Trivial merge