[master] Updated ChangeLog and finished trac3732 merging

diff --git a/ChangeLog b/ChangeLog
index 5a5d8b65e3a252badeb04fc25b69f3dfdc8bbad9..ff58b9c8c81d35f040b903141a52a0033e4c9125 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+951.   [build]         fdupont
+       Removed BUNDY configuration backend.
+       (Trac #3732, git xxx)
+
 950.   [doc]           marcin
        Updated section about logging in the User Guide. Also,
        updated Hooks Developer's Guide with the recommendations for

diff --git a/src/lib/cc/session_config.h.pre.in b/src/lib/cc/session_config.h.pre.in
deleted file mode 100644 (file)
index 91c26c0..0000000
--- a/src/lib/cc/session_config.h.pre.in
+++ /dev/null
@@ -1,2 +0,0 @@
-#define KEA_MSGQ_SOCKET_FILE "@@LOCALSTATEDIR@@/@PACKAGE@/kea_msgq_socket"
-

diff --git a/src/lib/cc/tests/session_unittests_config.h.in b/src/lib/cc/tests/session_unittests_config.h.in
deleted file mode 100644 (file)
index 62571c1..0000000
--- a/src/lib/cc/tests/session_unittests_config.h.in
+++ /dev/null
@@ -1,2 +0,0 @@
-#define TEST_SOCKET_FILE "@builddir@/test_socket.sock"
-