From 80fb6d82cbfd9f4aeecac53cad0d37edb3c83745 Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Wed, 15 Aug 2007 16:54:21 +0000 Subject: [PATCH] kes Update AUTHORs file kes Increase the default max concurrent jobs to 20 in FD and SD to correspond with the default .conf files. kes Rewrite the Win32 service routines. This eliminates the 3 copies some different, of the same file created by RN when porting the Win32 SD and Dir. kes Rearrange some of the Win32 directories and the placement of the files in them. kes Set DEVELOPER flag in version.h git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@5358 91ce42f0-d328-0410-95d8-f526ca767f89 --- bacula/AUTHORS | 2 ++ bacula/src/filed/filed_conf.c | 2 +- bacula/src/stored/stored_conf.c | 2 +- bacula/src/version.h | 6 +++--- bacula/technotes-2.1 | 15 ++++++++++++++- 5 files changed, 21 insertions(+), 6 deletions(-) diff --git a/bacula/AUTHORS b/bacula/AUTHORS index 9764f56489..93575d2d9e 100644 --- a/bacula/AUTHORS +++ b/bacula/AUTHORS @@ -18,6 +18,7 @@ Andreas Piesk Andrew Ford Arno Lehmann Bernd Frick +Bill Moran Carlos A. Molina G Carsten Paeth Chris Lee @@ -64,6 +65,7 @@ Morgan Nic Bellamy Nicolas Boichat Olivier Lehmann +Peter Buschmann Peter Eriksson Philippe Chauvat Phil Stracchino diff --git a/bacula/src/filed/filed_conf.c b/bacula/src/filed/filed_conf.c index 3018ac1efd..427bc4bcfb 100644 --- a/bacula/src/filed/filed_conf.c +++ b/bacula/src/filed/filed_conf.c @@ -96,7 +96,7 @@ static RES_ITEM cli_items[] = { {"piddirectory", store_dir, ITEM(res_client.pid_directory), 0, ITEM_REQUIRED, 0}, {"subsysdirectory", store_dir, ITEM(res_client.subsys_directory), 0, 0, 0}, {"scriptsdirectory", store_dir, ITEM(res_client.scripts_directory), 0, 0, 0}, - {"maximumconcurrentjobs", store_pint, ITEM(res_client.MaxConcurrentJobs), 0, ITEM_DEFAULT, 10}, + {"maximumconcurrentjobs", store_pint, ITEM(res_client.MaxConcurrentJobs), 0, ITEM_DEFAULT, 20}, {"messages", store_res, ITEM(res_client.messages), R_MSGS, 0, 0}, {"sdconnecttimeout", store_time,ITEM(res_client.SDConnectTimeout), 0, ITEM_DEFAULT, 60 * 30}, {"heartbeatinterval", store_time, ITEM(res_client.heartbeat_interval), 0, ITEM_DEFAULT, 0}, diff --git a/bacula/src/stored/stored_conf.c b/bacula/src/stored/stored_conf.c index d40e212e0c..caace4c970 100644 --- a/bacula/src/stored/stored_conf.c +++ b/bacula/src/stored/stored_conf.c @@ -75,7 +75,7 @@ static RES_ITEM store_items[] = { {"piddirectory", store_dir, ITEM(res_store.pid_directory), 0, ITEM_REQUIRED, 0}, {"subsysdirectory", store_dir, ITEM(res_store.subsys_directory), 0, 0, 0}, {"scriptsdirectory", store_dir, ITEM(res_store.scripts_directory), 0, 0, 0}, - {"maximumconcurrentjobs", store_pint, ITEM(res_store.max_concurrent_jobs), 0, ITEM_DEFAULT, 10}, + {"maximumconcurrentjobs", store_pint, ITEM(res_store.max_concurrent_jobs), 0, ITEM_DEFAULT, 20}, {"heartbeatinterval", store_time, ITEM(res_store.heartbeat_interval), 0, ITEM_DEFAULT, 0}, {"tlsenable", store_bit, ITEM(res_store.tls_enable), 1, 0, 0}, {"tlsrequire", store_bit, ITEM(res_store.tls_require), 1, 0, 0}, diff --git a/bacula/src/version.h b/bacula/src/version.h index 06413385b7..c3ba21d46b 100644 --- a/bacula/src/version.h +++ b/bacula/src/version.h @@ -3,9 +3,9 @@ */ #undef VERSION -#define VERSION "2.2.0" -#define BDATE "08 August 2007" -#define LSMDATE "08Aug07" +#define VERSION "2.3.0" +#define BDATE "15 August 2007" +#define LSMDATE "15Aug07" #define PROG_COPYRIGHT "Copyright (C) %d-2007 Free Software Foundation Europe e.V.\n" #define BYEAR "2007" /* year for copyright messages in progs */ diff --git a/bacula/technotes-2.1 b/bacula/technotes-2.1 index 0183f968ff..a0a5ba0a0e 100644 --- a/bacula/technotes-2.1 +++ b/bacula/technotes-2.1 @@ -1,6 +1,19 @@ - Technical notes on version 2.1 + Technical notes on version 2.3 General: +15Aug07 +kes Update AUTHORs file +kes Increase the default max concurrent jobs to 20 in FD and SD to + correspond with the default .conf files. +kes Rewrite the Win32 service routines. This eliminates the 3 copies + some different, of the same file created by RN when porting the + Win32 SD and Dir. +kes Rearrange some of the Win32 directories and the placement of the files + in them. +kes Set DEVELOPER flag in version.h + +======================================================================== +Release Version 2.2.0 09Aug07 kes Apply a second doc patch from Marc. kes Apply a doc patch from Marc Schiffbauer that -- 2.39.5