Final changes

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@1628 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/ChangeLog b/bacula/ChangeLog
index 010001bae1de2c2394becabf76c1619286e6512b..440bb3e449c052a6091aaf83d2143d48f0d19b7c 100644 (file)
--- a/bacula/ChangeLog
+++ b/bacula/ChangeLog
@@ -1,4 +1,9 @@
 
+Changes to 1.35.7:
+03Oct04
+- Apply Martin's patch that puts back the run pool override
+  code -- dumb me for removing it.
+
 Changes to 1.35.6:
 02Oct04
 - Create patches/README and the patch summary file.

diff --git a/bacula/ReleaseNotes b/bacula/ReleaseNotes
index 7a56dff35d8237ad19bee56dfc7fd3b971b1819c..25c24f51ca95f5368ad0231bd588ea7c54cfd477 100644 (file)
--- a/bacula/ReleaseNotes
+++ b/bacula/ReleaseNotes
@@ -1,10 +1,10 @@
 
-          Release Notes for Bacula 1.35.6
+          Release Notes for Bacula 1.35.7
 
   Bacula code: Total files = 396 Total lines = 116,116 (*.h *.c *.in)
 
 
-Changes for 1.35.6
+Changes for 1.35.7
 Major Changes:
 - Tray monitor program
 - Bacula Rescue CDROM     

diff --git a/bacula/src/dird/scheduler.c b/bacula/src/dird/scheduler.c
index 9beb9863dba00e77956a596de2afe2eec70f48c9..f32a633179a2907b3addd7ad95e3ebb3c691a565 100644 (file)
--- a/bacula/src/dird/scheduler.c
+++ b/bacula/src/dird/scheduler.c
@@ -147,6 +147,15 @@ JCR *wait_for_next_job(char *one_shot_job_to_run)
    if (run->pool) {
       jcr->pool = run->pool;         /* override pool */
    }
+   if (run->full_pool) {
+      jcr->full_pool = run->full_pool; /* override full pool */
+   }
+   if (run->inc_pool) {
+      jcr->inc_pool = run->inc_pool;  /* override inc pool */
+   }
+   if (run->dif_pool) {
+      jcr->dif_pool = run->dif_pool;  /* override dif pool */
+   }
    if (run->storage) {
       jcr->store = run->storage;      /* override storage */
    }

diff --git a/bacula/src/version.h b/bacula/src/version.h
index f499ef9438871d69ecad9792a4b4df764fab9440..3e3a7079a5ff3c8e4862aef34f2bb24a3cb72b71 100644 (file)
--- a/bacula/src/version.h
+++ b/bacula/src/version.h
@@ -1,8 +1,8 @@
 /* */
 #undef  VERSION
 #define VERSION "1.35.6"
-#define BDATE   "02 October 2004"
-#define LSMDATE "02Oct04"
+#define BDATE   "03 October 2004"
+#define LSMDATE "03Oct04"
 
 /* Debug flags */
 #undef  DEBUG