From: Heiko Schlittermann (HS12-RIPE) <hs@schlittermann.de>
Date: Tue, 3 Apr 2018 22:06:22 +0000 (+0200)
Subject: Merge branch 'master' of buildfarm.exim.org
X-Git-Url: https://git.exim.org/buildfarm-server.git/commitdiff_plain/0501174849ec7dbb3c32b338ce590e6b5625bf7d?hp=81b6d9ed2801481e44e7479eb8bd54ec3aaf837d

Merge branch 'master' of buildfarm.exim.org
---

diff --git a/cgi-bin/eximstatus.pl b/cgi-bin/eximstatus.pl
index d2e4638..e471c92 100755
--- 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 692569d..93e6f10 160000
--- a/htdocs/wiki
+++ b/htdocs/wiki
@@ -1 +1 @@
-Subproject commit 692569d94c48896d3aca219ba21ffe664b51b28a
+Subproject commit 93e6f10fba577be1a1ace4228d79f97174c696e4