[Swift-commit] r6606 - in branches/faster: . etc/sites

[hategan at ci.uchicago.edu]

Author: hategan
Date: 2013-07-08 00:34:34 -0500 (Mon, 08 Jul 2013)
New Revision: 6606

Modified:
   branches/faster/
   branches/faster/etc/sites/midway
Log:
merged 6182 from trunk


Property changes on: branches/faster
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/release-0.93:4761-5122
/trunk:6172,6177
   + /branches/release-0.93:4761-5122
/trunk:6172,6177,6182

Modified: branches/faster/etc/sites/midway
===================================================================
--- branches/faster/etc/sites/midway	2013-07-08 05:33:04 UTC (rev 6605)
+++ branches/faster/etc/sites/midway	2013-07-08 05:34:34 UTC (rev 6606)
@@ -1,7 +1,9 @@
   <pool handle="midway-sandyb">
     <execution provider="coaster" jobmanager="local:slurm"/>
     <profile namespace="globus" key="jobsPerNode">16</profile>
-    <profile namespace="globus" key="maxWalltime">24:00:00</profile>
+    <profile namespace="globus" key="maxWalltime">_WALLTIME_</profile>
+    <profile namespace="globus" key="highOverAllocation">100</profile>
+    <profile namespace="globus" key="lowOverAllocation">100</profile>
     <profile namespace="globus" key="queue">sandyb</profile>
     <profile namespace="karajan" key="initialScore">10000</profile>
     <filesystem provider="local"/>
@@ -11,7 +13,9 @@
   <pool handle="midway-westmere">
     <execution provider="coaster" jobmanager="local:slurm"/>
     <profile namespace="globus" key="jobsPerNode">12</profile>
-    <profile namespace="globus" key="maxWalltime">24:00:00</profile>
+    <profile namespace="globus" key="maxWalltime">_WALLTIME_</profile>
+    <profile namespace="globus" key="highOverAllocation">100</profile>
+    <profile namespace="globus" key="lowOverAllocation">100</profile>
     <profile namespace="globus" key="queue">westmere</profile>
     <profile namespace="karajan" key="initialScore">10000</profile>
     <filesystem provider="local"/>