[Piuparts-commits] [SCM] piuparts git repository branch, master, updated. 0.49-194-g6f9dd07

[Andreas Beckmann]

The following commit has been merged in the master branch:
commit 3d7ab4306f9203c8af0050841d08aba56d33dc2c
Author: Andreas Beckmann <anbe at debian.org>
Date:   Fri Mar 8 22:44:01 2013 +0100

    p.conf: use global max-reserved=50
    
    with precedence set properly max-reserved is no longer useful for
    "load balancing"
    
    Signed-off-by: Andreas Beckmann <anbe at debian.org>

diff --git a/instances/piuparts.conf.goldwasser b/instances/piuparts.conf.goldwasser
index a2f321c..fe717e4 100644
--- a/instances/piuparts.conf.goldwasser
+++ b/instances/piuparts.conf.goldwasser
@@ -42,6 +42,7 @@ master-command = PYTHONPATH=/org/piuparts.debian.org/lib/python2.6/dist-packages
 # for a whole day) but useful for testing master-slave mode, for running on a
 # test system 24/7 without causing load for 24/7
 idle-sleep = 86400
+max-reserved = 50
 
 
 [sid]
@@ -49,7 +50,6 @@ description = + Fails if there are leftover files after purge.
 piuparts-flags =
 	--scriptsdir /etc/piuparts/scripts-leftovers
 distro = sid
-max-reserved = 50
 log-file = sid.log
 # Once there are no packages left which leave files on purge behind,
 # --pedantic-purge-test should be added
@@ -60,7 +60,6 @@ piuparts-flags =
 	--warn-on-leftovers-after-purge
 distro = testing
 upgrade-test-distros = testing sid
-max-reserved = 50
 reschedule-old-count = 0
 log-file = testing2sid.log
 
@@ -69,7 +68,6 @@ log-file = testing2sid.log
 piuparts-flags =
 	--warn-on-leftovers-after-purge
 distro = wheezy
-max-reserved = 50
 reschedule-old-count = 0
 log-file = wheezy.log
 
@@ -80,7 +78,6 @@ piuparts-flags =
 	%(flags-start-squeeze)s
 distro = squeeze
 upgrade-test-distros = squeeze wheezy
-max-reserved = 50
 reschedule-old-count = 0
 log-file = squeeze2wheezy.log
 
diff --git a/instances/piuparts.conf.piatti b/instances/piuparts.conf.piatti
index fc9cc0f..ca8403d 100644
--- a/instances/piuparts.conf.piatti
+++ b/instances/piuparts.conf.piatti
@@ -54,8 +54,8 @@ master-command = PYTHONPATH=/org/piuparts.debian.org/lib/python2.6/dist-packages
 idle-sleep = 1800
 # 60*60*24*7
 max-tgz-age = 604800
-# rescheduling settings
 max-reserved = 50
+# rescheduling settings
 expire-old-days = 120
 reschedule-old-days = 90
 reschedule-old-count = 15
@@ -74,7 +74,6 @@ piuparts-flags =
 # Once there are no packages left which leave files on purge behind,
 # --pedantic-purge-test should be added
 distro = sid
-max-reserved = 150
 log-file = sid.log
 
 
@@ -85,7 +84,6 @@ piuparts-flags =
 distro = testing
 upgrade-test-distros = testing sid
 reschedule-old-count = 0
-max-reserved = 100
 log-file = testing2sid.log
 
 
@@ -94,7 +92,6 @@ precedence = 2
 piuparts-flags =
 	--warn-on-leftovers-after-purge
 distro = wheezy
-max-reserved = 100
 log-file = wheezy.log
 
 
@@ -105,7 +102,6 @@ piuparts-flags =
 	%(flags-start-squeeze)s
 distro = squeeze
 upgrade-test-distros = squeeze wheezy
-max-reserved = 100
 log-file = squeeze2wheezy.log
 
 
@@ -131,7 +127,6 @@ piuparts-flags =
 	%(flags-start-squeeze)s
 	%(flags-end-squeeze)s
 distro = squeeze
-max-reserved = 50
 reschedule-old-count = 50
 log-file = squeeze.log
 

-- 
piuparts git repository