Merge branch 'master' of buildfarm.exim.org

diff --git a/cgi-bin/eximstatus.pl b/cgi-bin/eximstatus.pl
index d2e46380eca391bb0e4dc9ea33c219af470c84e5..e471c9224cff57be440eef0db9f73d80fe855a6c 100755 (executable)
--- a/cgi-bin/eximstatus.pl
+++ b/cgi-bin/eximstatus.pl
@@ -447,15 +447,16 @@ $db->do("delete from dashboard_mat");
 $db->do("insert into dashboard_mat select * from dashboard_mat_data");
 $db->commit;
 
-if ($stage ne 'OK')
-{
-       $db->begin_work;
-       # prevent occasional duplication by forcing serialization of this operation
-       $db->do("lock table nrecent_failures in share row exclusive mode");
-       $db->do("delete from nrecent_failures");
-       $db->do("insert into nrecent_failures select bs.sysname, bs.snapshot, bs.branch from build_status bs where bs.stage <> 'OK' and bs.snapshot > now() - interval '90 days'");
-       $db->commit;
-}
+
+#if ($stage ne 'OK') # On Exim build farm nrecent_failures is a view, not table... comment out
+#{
+#      $db->begin_work;
+#      # prevent occasional duplication by forcing serialization of this operation
+#      $db->do("lock table nrecent_failures in share row exclusive mode");
+#      $db->do("delete from nrecent_failures");
+#      $db->do("insert into nrecent_failures select bs.sysname, bs.snapshot, bs.branch from build_status bs where bs.stage <> 'OK' and bs.snapshot > now() - interval '90 days'");
+#      $db->commit;
+#}
 
 $db->disconnect;
 

diff --git a/htdocs/wiki b/htdocs/wiki
index 692569d94c48896d3aca219ba21ffe664b51b28a..93e6f10fba577be1a1ace4228d79f97174c696e4 160000 (submodule)
--- a/htdocs/wiki
+++ b/htdocs/wiki
@@ -1 +1 @@
-Subproject commit 692569d94c48896d3aca219ba21ffe664b51b28a
+Subproject commit 93e6f10fba577be1a1ace4228d79f97174c696e4