From 8fadd4eb9de8fc6dccd710dbbc3df1a331693152 Mon Sep 17 00:00:00 2001
From: Kern Sibbald <kern@sibbald.com>
Date: Mon, 20 Nov 2017 08:27:33 +0100
Subject: [PATCH] Tweak ChangeLog and ReleaseNotes for last backport from
 Enterprise

---
 bacula/ChangeLog    | 12 +++++++++++-
 bacula/ReleaseNotes |  9 ++++++++-
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/bacula/ChangeLog b/bacula/ChangeLog
index d6f9d866ee..3cc9ad7852 100644
--- a/bacula/ChangeLog
+++ b/bacula/ChangeLog
@@ -2,7 +2,6 @@
 
 Release 9.0.6
 
-
 19Nov17
  - Update AUTHORS for recent commits
  - Remove incorrecly placed openssl-compat.h
@@ -17,10 +16,18 @@ Release 9.0.6
  - Fix bug #2315 INTEGER misspelled in update_sqlite3_tables.in
  - Try to fix bug #2349 multiple recycle messages
 
+17Nov17
+ - Add support for items with comma in ini_store_alist_str()
+
 15Nov17
+ - Fix segfault after the reload of an incorrect configuration
+ - Add temporary fix to avoid a deadlock after a reload command on an incorrect 
+  configuration
  - baculum: Throw 404 error if service not known
 
 14Nov17
+ - Fix race condition between setip and the access to CLIENT::address()
+ - Fix #3284 about Client address not reloaded properly
  - baculum: Use home page url when an error is shown
 
 12Nov17
@@ -49,6 +56,9 @@ Release 9.0.6
  - crypto: Add a tiny OpenSSL compat level
  - crypto: remove support for ancient openssl
 
+06Nov17
+ - fix #3269 obey the user choice of "Are you sure you want to delete X JobIds
+
 02Nov17
  - Add restore wizard to the tray monitor.
  - Preparation fixes: remove some warning
diff --git a/bacula/ReleaseNotes b/bacula/ReleaseNotes
index 919692c56d..caf5741b29 100644
--- a/bacula/ReleaseNotes
+++ b/bacula/ReleaseNotes
@@ -23,7 +23,13 @@ appreciated.
  - Apply patches from bugs #2325 and #2326 to fix FIFO bugs
  - Fix bug #2315 INTEGER misspelled in update_sqlite3_tables.in
  - Try to fix bug #2349 multiple recycle messages
+ - Add support for items with comma in ini_store_alist_str()
+ - Fix segfault after the reload of an incorrect configuration
+ - Add temporary fix to avoid a deadlock after a reload command on an incorrect 
+   configuration
  - baculum: Throw 404 error if service not known
+ - Fix race condition between setip and the access to CLIENT::address()
+ - Fix #3284 about Client address not reloaded properly
  - baculum: Use home page url when an error is shown
  - Fix bug #2346 Dir blocks when max reloads reached
  - baculum: Send config to api server as json
@@ -41,12 +47,13 @@ appreciated.
  - crypto: Use DEFINE_STACK_OF()
  - crypto: Add a tiny OpenSSL compat level
  - crypto: remove support for ancient openssl
+ - fix #3269 obey the user choice of "Are you sure you want to delete X JobIds
  - Add restore wizard to the tray monitor.
  - Preparation fixes: remove some warning
  - Add ASSERTD() to track NULL Volume name error
  - Add "noautoparent" restore command option to disable the automatic parent 
   directory selection
- - Make qt-console compatible to Qt5 (Qt4 still works)
+ - Make qt-console compatible to Qt5 (Qt4 still work)
 
 Bugs fixed/closed since last release:
 2315 2325 2346 2349 2351
-- 
2.39.5