Final changes

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

diff --git a/bacula/ChangeLog b/bacula/ChangeLog
index 816563f4040e107f2f3c7ba440fd37015e681b93..c30719b235b92050e358fa734c70486306db35df 100644 (file)
--- a/bacula/ChangeLog
+++ b/bacula/ChangeLog
@@ -1,3 +1,14 @@
+Changes to 1.37.37 released 26 Aug 05
+24Aug05
+- Ensure that the drive is closed before calling the
+  mtx-changer script so that the script can access the drive.
+- Add drive name to reserved Volume list printout in SD.
+23Aug05
+- Fix bug in acquire.c that incorrectly reported volume
+  busy.
+- Add additional debug code and messages in reserve.c
+- Eliminate unwanted warning message in reserve.c
+
 Changes to 1.37.36 released 22 Aug 05
 20Aug05
 - Landon's fix for NLS detection
@@ -1292,4 +1303,3 @@ Changes to 1.37.2:
 - Make built-in variables table driven.
 - First cut of Python Events for Bacula. Director only.
   StartJob, EndJob, NewVolume events.
-

diff --git a/bacula/ReleaseNotes b/bacula/ReleaseNotes
index bf1114312c284af3ea8c3b3c981c56575d2c68dd..1612d146b019edca45c209ad72f9f63097991f62 100644 (file)
--- a/bacula/ReleaseNotes
+++ b/bacula/ReleaseNotes
@@ -1,5 +1,5 @@
 
-          Release Notes for Bacula 1.37.36
+          Release Notes for Bacula 1.37.37
 
   Bacula code: Total files = 420 Total lines = 137,650 (*.h *.c *.in)
 

diff --git a/bacula/kernstodo b/bacula/kernstodo
index c2539350a05d61a47e97ab5374feaaf986a9231f..987aad7a57268b876c3984c305fb8c2633deaef6 100644 (file)
--- a/bacula/kernstodo
+++ b/bacula/kernstodo
@@ -17,6 +17,10 @@ Final items for 1.37 before release:
 -  Arno had to do -- to get update slots=x to work
    UPDATE Media SET InChanger=0,Slot=0 WHERE InChanger>0 AND Slot>0; (MySQL)
 
+- Add recycle event.
+- Add scratch pool event.
+- Add Win32 FileSet definition somewhere
+
 Document:
 - datadir for po files.
 - AM_GNU_GETTEXT finds the library if you specify 
@@ -29,6 +33,15 @@ Document:
   records have been removed from the catalog.
 
 For 1.39:
+- new pool XXX with ScratchPoolId = MyScratchPool's PoolId and
+  let it fill itself, and RecyclePoolId = XXX's PoolId so I can
+  see if it become stable and I just have to supervise
+  MyScratchPool
+- If I want to remove this pool, I set RecyclePoolId = MyScratchPool's
+  PoolId, and when it is empty remove it.
+- Figure out how to recycle Scratch volumes back to the Scratch
+  Pool.
+- Add Volume=SCRTCH
 - Allow Check Labels to be used with Bacula labels.
 - "Resuming" a failed backup (lost line for example) by using the
   failed backup as a sort of "base" job.

diff --git a/bacula/src/dird/bacula-dir.conf.in b/bacula/src/dird/bacula-dir.conf.in
index 819bd41def07425cdd36c57cc85eb253af296843..33db255b721cc66f0f44ade6e90d03f845231ecc 100644 (file)
--- a/bacula/src/dird/bacula-dir.conf.in
+++ b/bacula/src/dird/bacula-dir.conf.in
@@ -176,7 +176,7 @@ Client {
 #}
 
 
-# Definiton of file storage device
+# Definition of file storage device
 Storage {
   Name = File
 # Do not use "localhost" here    
@@ -212,6 +212,17 @@ Storage {
 #  MediaType = "8mm"
 #}
 
+# Definition of DVD storage device
+#Storage {
+#  Name = "DVD"
+#  Do not use "localhost" here
+#  Address = @hostname@                # N.B. Use a fully qualified name here
+#  SDPort = @sd_port@
+#  Password = "@sd_password@"
+#  Device = "DVD Writer"
+#  MediaType = "DVD"
+#}
+
 
 # Generic catalog service
 Catalog {

diff --git a/bacula/src/stored/append.c b/bacula/src/stored/append.c
index 8f6e71bb617a0cc6f8047becab72b633fabec07b..8427f7e141dd6d8c9503b26f299e498055cf0cc5 100644 (file)
--- a/bacula/src/stored/append.c
+++ b/bacula/src/stored/append.c
@@ -8,19 +8,14 @@
    Copyright (C) 2000-2005 Kern Sibbald
 
    This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
+   modify it under the terms of the GNU General Public License
+   version 2 as amended with additional clauses defined in the
+   file LICENSE in the main source directory.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public
-   License along with this program; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-   MA 02111-1307, USA.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 
+   the file LICENSE for additional details.
 
  */
 

diff --git a/bacula/src/stored/bacula-sd.conf.in b/bacula/src/stored/bacula-sd.conf.in
index 6b4cec289a37e199ce1e688dcbaa4da883a2f909..c0de3fa006c35b3d9f5f72de9705f62cd9751294 100644 (file)
--- a/bacula/src/stored/bacula-sd.conf.in
+++ b/bacula/src/stored/bacula-sd.conf.in
@@ -147,7 +147,7 @@ Device {
 # A DVD device
 #
 #Device {
-#  Name = "DVD-WRITER"
+#  Name = "DVD-Writer"
 #  Media Type = DVD
 #  Archive Device = /dev/hdc
 #  LabelMedia = yes;                   # lets Bacula label unlabeled media