]> git.ipfire.org Git - thirdparty/kea.git/commitdiff
[master] Merge branch 'trac5114' (toElement aka unparse)
authorTomek Mrugalski <tomasz@isc.org>
Fri, 10 Mar 2017 18:39:27 +0000 (19:39 +0100)
committerTomek Mrugalski <tomasz@isc.org>
Fri, 10 Mar 2017 18:39:27 +0000 (19:39 +0100)
# Conflicts:
# configure.ac
# src/bin/agent/tests/Makefile.am

1  2 
configure.ac

diff --cc configure.ac
index 0e407028859d067faeb4f1cc186ed967ea2bda8b,cb6583b80b25feb41bf3d52a3aa77badf5bcfe77..80506f5fe7b80a44d22d59a0b8992e1b6bb443c4
@@@ -1636,20 -1716,6 +1708,11 @@@ AC_CONFIG_FILES([Makefil
                   src/bin/perfdhcp/Makefile
                   src/bin/perfdhcp/tests/Makefile
                   src/bin/perfdhcp/tests/testdata/Makefile
-                  src/bin/admin/Makefile
-                  src/bin/admin/kea-admin
-                  src/bin/admin/tests/Makefile
-                  src/bin/admin/tests/data/Makefile
-                  src/bin/admin/tests/memfile_tests.sh
-                  src/bin/admin/tests/mysql_tests.sh
-                  src/bin/admin/tests/pgsql_tests.sh
-                  src/bin/admin/tests/cql_tests.sh
-                  src/bin/agent/tests/test_libraries.h
 +                 src/bin/shell/Makefile
 +                 src/bin/shell/kea-shell
 +                 src/bin/shell/tests/Makefile
 +                 src/bin/shell/tests/shell_process_tests.sh
 +                 src/bin/shell/tests/shell_unittest.py
                   src/hooks/Makefile
                   src/hooks/dhcp/Makefile
                   src/hooks/dhcp/user_chk/Makefile