From 5199b381e0a4751b3b21d92095ad81fbbc07dd85 Mon Sep 17 00:00:00 2001
From: Kern Sibbald <kern@sibbald.com>
Date: Tue, 3 Jun 2014 10:28:41 +0200
Subject: [PATCH] Tweak version and Release Notes

---
 bacula/ChangeLog     | 18 +++++++++++++++++-
 bacula/ReleaseNotes  | 18 +++++++++++++++++-
 bacula/src/version.h |  4 ++--
 3 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/bacula/ChangeLog b/bacula/ChangeLog
index 1aacbe11b3..5b97b5d8ad 100644
--- a/bacula/ChangeLog
+++ b/bacula/ChangeLog
@@ -1,4 +1,20 @@
-              Changelog on version 7.0.3
+              Changelog on version 7.0.4
+
+Release version 7.0.4
+02Jun14
+ - Better error handling for cancel command
+
+01Jun14
+ - Fix compiler warning + simplify some #ifdefs
+
+22May14
+ - Fix copy/migration to second SD
+
+19May14
+ - Fix calls to sl.set_string()
+ - Improve sellist code
+
+=====
 
 Release version 7.0.3
 12May14
diff --git a/bacula/ReleaseNotes b/bacula/ReleaseNotes
index ea6bf199a5..074c541509 100644
--- a/bacula/ReleaseNotes
+++ b/bacula/ReleaseNotes
@@ -1,6 +1,22 @@
 
-               Release Notes for Bacula 7.0.3
+               Release Notes for Bacula 7.0.4
 
+Release version 7.0.4
+This is a bug fix release to version 7.0.3.  We recommend that
+everyone upgrade to this version.
+
+The main fixes are to make copy/migration to a second SD work, and
+to cleanup some of the inconsistencies in the cancel command which 
+could confuse the user.
+
+02Jun14
+ - Better error handling for cancel command
+ - Fix compiler warning + simplify some #ifdefs
+ - Fix copy/migration to second SD
+ - Fix calls to sl.set_string()
+ - Improve sellist code
+
+=============================================================
 Release version 7.0.3
 This is a bug fix release to version 7.0.2. We recommend that
 everyone using version 7.0.2 upgrade to this version.
diff --git a/bacula/src/version.h b/bacula/src/version.h
index f0cb73eaa8..f157a3b3ac 100644
--- a/bacula/src/version.h
+++ b/bacula/src/version.h
@@ -1,8 +1,8 @@
 
 #undef  VERSION
 #define VERSION "7.0.4"
-#define BDATE   "22 May 2014"
-#define LSMDATE "22May14"
+#define BDATE   "04 June 2014"
+#define LSMDATE "04Jun14"
 
 #define PROG_COPYRIGHT "Copyright (C) %d-2014 Free Software Foundation Europe e.V.\n"
 #define BYEAR "2014"       /* year for copyright messages in progs */
-- 
2.39.5