aboutsummaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
authorPascal Terjan <pterjan@mageia.org>2012-04-06 21:57:03 +0000
committerPascal Terjan <pterjan@mageia.org>2012-04-06 21:57:03 +0000
commitb3570c1d3d2e2e4b829181fd5bd1392ee1f90f05 (patch)
treee2e84181b1a1b5274097e197dfffc9d4b7738def /modules
parentc350c2c8b6202c7da2fef5b44194d7492af5e7d9 (diff)
downloadpuppet-b3570c1d3d2e2e4b829181fd5bd1392ee1f90f05.tar
puppet-b3570c1d3d2e2e4b829181fd5bd1392ee1f90f05.tar.gz
puppet-b3570c1d3d2e2e4b829181fd5bd1392ee1f90f05.tar.bz2
puppet-b3570c1d3d2e2e4b829181fd5bd1392ee1f90f05.tar.xz
puppet-b3570c1d3d2e2e4b829181fd5bd1392ee1f90f05.zip
Revert previous commit, it had almost finished in much less than the timeout and hanged then
Diffstat (limited to 'modules')
-rw-r--r--modules/buildsystem/templates/iurt/cauldron.conf3
1 files changed, 1 insertions, 2 deletions
diff --git a/modules/buildsystem/templates/iurt/cauldron.conf b/modules/buildsystem/templates/iurt/cauldron.conf
index 52cee890..119ba666 100644
--- a/modules/buildsystem/templates/iurt/cauldron.conf
+++ b/modules/buildsystem/templates/iurt/cauldron.conf
@@ -24,8 +24,7 @@
'openoffice.org64' => 345600,
'openoffice.org-go-ooo' => 345600,
'openoffice.org64-go-ooo' => 345600,
- 'libreoffice' => 345600,
- 'maxima' => 28800
+ 'libreoffice' => 345600
},
}