Merge from trunk. Kills procs in sliver rather than restarting context.

diff --git a/swapmon.py b/swapmon.py
index f2654e6..f7e62c6 100755 (executable)
--- a/swapmon.py
+++ b/swapmon.py
@@ -446,7 +446,6 @@ def main():
     while True:
         used = swap_used()
         if last_used is None:  last_used = used
-        
    
         if used >= reboot_thresh:
             # Dump slice state before rebooting