Update changelog and version

diff --git a/bacula/ChangeLog b/bacula/ChangeLog
index 4b4b46c0ed3758823b972e1d95ce5396d9fea51e..fc921d9ab955073a5bd6f9a0f8c0d58ec7ef88f3 100644 (file)
--- a/bacula/ChangeLog
+++ b/bacula/ChangeLog
@@ -1,7 +1,21 @@
-
         ChangeLog for Bacula Enterprise version 11.0.0
 
+10Dec20
+ - Fix #7165 About incorrect JSON output for SHA256/SHA512 option
+
+09Dec20
+ - win32: Update openssl for Windows to 1.1.1i
+
+07Dec20
+ - Fix debug message
+ - Do not hardcode FD Caps
+
+04Dec20
+ - Fix MySQL update scripts for new MariaDB
+ - Fix warning in ./configure
+
 03Dec20
+ - Restore custom permission of symlink on FreeBSD and MacOS
  - Sync FD/SD Version with Enterprise
  - Enable SD CAPS in hello()
  - Fix tools/Makefile.in

diff --git a/bacula/ReleaseNotes b/bacula/ReleaseNotes
index 8b75abc1bdfb0ba9f8fd74667b940b6604d3dc98..3fad9ab8fe0dff01b4a45a54d024b39dcde19df2 100644 (file)
--- a/bacula/ReleaseNotes
+++ b/bacula/ReleaseNotes
@@ -37,7 +37,7 @@ running the script can take some time depending on your database size.
 
 ----------------------------------------------------------------
 
-Release 11.0.0 01 December 2020
+Release 11.0.0 12 December 2020
 
 11.0.0 is a major release.
 
@@ -68,8 +68,12 @@ Misc:
  - Support for GLOB pattern in Console ACL directives
  - Faster CRC32 algorithm
 
+Please see the New Features chapter of the manual for documentation on
+the new features.
+
 ----------------------------------------------------------------
 
+
                Release Notes for Bacula 9.6.3
 
 This is a minor bug fix (mostly fixing incorrect copyrights) to Release-9.6.2.

diff --git a/bacula/src/version.h b/bacula/src/version.h
index daf61cc7dd92f6bc166e9b70623e177ddb20c500..8726e6e692eec60623b89f67098482b4275a8973 100644 (file)
--- a/bacula/src/version.h
+++ b/bacula/src/version.h
@@ -25,8 +25,8 @@
 
 /* Note: there can be only *one* VERSION in this file */
 #define VERSION "11.0.0"
-#define BDATE   "03 December 2020"
-#define LSMDATE "03Dec20"
+#define BDATE   "12 December 2020"
+#define LSMDATE "12Dec20"
 
 #define RELEASE 1   /* Use ONLY in rpms */