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

[hategan at ci.uchicago.edu]

Author: hategan
Date: 2013-07-08 00:41:56 -0500 (Mon, 08 Jul 2013)
New Revision: 6610

Modified:
   branches/faster/
   branches/faster/etc/sites/local
Log:
merged 6203 from trunk


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

Modified: branches/faster/etc/sites/local
===================================================================
--- branches/faster/etc/sites/local	2013-07-08 05:40:59 UTC (rev 6609)
+++ branches/faster/etc/sites/local	2013-07-08 05:41:56 UTC (rev 6610)
@@ -1,6 +1,6 @@
    <pool handle="localhost">
       <execution provider="local" url="none"/>
-      <profile namespace="karajan" key="jobThrottle">.31</profile>
+      <profile namespace="karajan" key="jobThrottle">_JOBTHROTTLE_</profile>
       <profile namespace="karajan" key="initialScore">10000</profile>
       <filesystem provider="local"/>
       <workdirectory>{env.HOME}/swiftwork</workdirectory>