Merge commit '40983bac81df783cbf07ecfc5b1a71c444c00c79'

This commit is contained in:
Kohsuke Kawaguchi committed 2011-03-29 11:27:16 -07:00
commit 05f36b4772
7 files changed
+21 -14

No files matched your search

@@ -1475,6 +1475,10 @@ public abstract class HudsonTestCase extends TestCase implements RootAction {
public void contextReleased(Context cx) {
}
});
// avoid a hang by setting a time out. It should be long enough to prevent
// false-positive timeout on slow systems
setTimeout(60*1000);
}
/**