Index: docs/manual/megatest_manual.html
==================================================================
--- docs/manual/megatest_manual.html
+++ docs/manual/megatest_manual.html
@@ -1135,10 +1135,20 @@
 <div class="title">test/itempath &#8658; host-type</div>
 <div class="content monospaced">
 <pre>runfirst/sum% remote</pre>
 </div></div>
 </div>
+<div class="sect3">
+<h4 id="_miscellaneous_setup_items">Miscellaneous Setup Items</h4>
+<div class="paragraph"><p>Attempt to rerun tests in "STUCK/DEAD", "n/a", "ZERO_ITEMS" states.</p></div>
+<div class="listingblock">
+<div class="title">In megatest.config</div>
+<div class="content monospaced">
+<pre>[setup]
+reruns 5</pre>
+</div></div>
+</div>
 </div>
 </div>
 </div>
 <div class="sect1">
 <h2 id="_the_testconfig_file">The testconfig File</h2>
@@ -1278,10 +1288,16 @@
 <div class="title">Skip if this test has been run in the past fifteen minutes and 15 seconds.</div>
 <div class="content monospaced">
 <pre>[skip]
 rundelay 15m 15s</pre>
 </div></div>
+</div>
+<div class="sect3">
+<h4 id="_disks">Disks</h4>
+<div class="paragraph"><p>A disks section in testconfig will override the disks section in
+megatest.config. This can be used to allocate disks on a per-test or per item
+basis.</p></div>
 </div>
 <div class="sect3">
 <h4 id="_controlled_waiver_propagation">Controlled waiver propagation</h4>
 <div class="paragraph"><p>If test is FAIL and previous test in run with same MT_TARGET is WAIVED then apply the following rules from the testconfig:
 If a waiver check is specified in the testconfig apply the check and if it passes then set this FAIL to WAIVED</p></div>
@@ -1562,10 +1578,10 @@
 <div id="footnotes"><hr></div>
 <div id="footer">
 <div id="footer-text">
 Version 1.0<br>
 Last updated
- 2015-07-12 21:50:37 MST
+ 2015-08-24 19:48:43 MST
 </div>
 </div>
 </body>
 </html>

Index: docs/manual/reference.txt
==================================================================
--- docs/manual/reference.txt
+++ docs/manual/reference.txt
@@ -46,10 +46,21 @@
 ^^^^^^^^^
 .test/itempath => host-type
 ------------
 runfirst/sum% remote
 ------------
+
+Miscellaneous Setup Items
+^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Attempt to rerun tests in "STUCK/DEAD", "n/a", "ZERO_ITEMS" states.
+
+.In megatest.config
+------------------
+[setup]
+reruns 5
+------------------
 
 The testconfig File
 -------------------
 
 Setup section

Index: runs.scm
==================================================================
--- runs.scm
+++ runs.scm
@@ -222,12 +222,19 @@
 	 (all-tests-registry #f)  ;; (tests:get-all)) ;; (tests:get-valid-tests (make-hash-table) test-search-path)) ;; all valid tests to check waiton names
 	 (all-test-names     #f)  ;; (hash-table-keys all-tests-registry))
 	 (test-names         #f)  ;; (tests:filter-test-names all-test-names test-patts))
 	 (required-tests     #f)  ;; Put fully qualified test/testpath names in this list to be done
 	 (task-key           (conc (hash-table->alist flags) " " (get-host-name) " " (current-process-id)))
-	 (tdbdat             (tasks:open-db)))
+	 (tdbdat             (tasks:open-db))
+	 (config-reruns      (let ((x (configf:lookup *configdat* "setup" "reruns")))
+			       (if x (string->number x) #f))))
 
+    ;; override the number of reruns from the configs
+    (if (and config-reruns
+	     (> run-count config-reruns))
+	(set! run-count config-reruns))
+    
     (if (tasks:need-server run-id)(tasks:start-and-wait-for-server tdbdat run-id 10))
 
     (let ((sighand (lambda (signum)
 		     ;; (signal-mask! signum) ;; to mask or not? seems to cause issues in exiting
 		     (if (eq? signum signal/stop)
@@ -479,11 +486,11 @@
 	    (thread-start! th2)
 	    (thread-join! th1)
 	    (set! keep-going #f)
 	    (thread-join! th2)
 	    ;; if run-count > 0 call, set -preclean and -rerun STUCK/DEAD
-	    (if (> run-count 0)
+	    (if (> run-count 0) ;; handle reruns
 		(begin
 		  (if (not (hash-table-ref/default flags "-preclean" #f))
 		      (hash-table-set! flags "-preclean" #t))
 		  (if (not (hash-table-ref/default flags "-rerun" #f))
 		      (hash-table-set! flags "-rerun" "STUCK/DEAD,n/a,ZERO_ITEMS"))