From: Tomek Mrugalski <tomasz@isc.org>
Date: Fri, 10 Mar 2017 18:39:27 +0000 (+0100)
Subject: [master] Merge branch 'trac5114' (toElement aka unparse)
X-Git-Tag: trac5152_base~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=df38c26f957c9ac329718ac9d70ffbcf7b95c4e9;p=thirdparty%2Fkea.git

[master] Merge branch 'trac5114' (toElement aka unparse)

# Conflicts:
#	configure.ac
#	src/bin/agent/tests/Makefile.am
---

df38c26f957c9ac329718ac9d70ffbcf7b95c4e9
diff --cc configure.ac
index 0e40702885,cb6583b80b..80506f5fe7
--- a/configure.ac
+++ b/configure.ac
@@@ -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