finished with 4.next until the next release

diff --git a/cgi-bin/eximstatus.pl b/cgi-bin/eximstatus.pl
index e471c9224cff57be440eef0db9f73d80fe855a6c..38a7d96dccb62f5c2375843d8e398ce0dd6d954c 100755 (executable)
--- a/cgi-bin/eximstatus.pl
+++ b/cgi-bin/eximstatus.pl
@@ -312,10 +312,10 @@ my $scmurl = $client_conf->{scm_url};
 
 my $logst = <<EOSQL;
     insert into build_status 
-      (sysname, snapshot,status, stage, log,conf_sum, branch,
+      (sysname, snapshot, status, stage, log, conf_sum, branch,
        changed_this_run, changed_since_success, 
-       log_archive_filenames , log_archive, build_flags, scm, scmurl, 
-       git_head_ref,frozen_conf)
+       log_archive_filenames, log_archive, build_flags, scm, scmurl, 
+       git_head_ref, frozen_conf)
     values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
 EOSQL
 ;

diff --git a/htdocs/branches_of_interest.txt b/htdocs/branches_of_interest.txt
index d0ce6974dc9407e95af75dd09c62d45f5e561d14..3b51c9ba9ffc9e5f934437707e86eaa42063c9d7 100644 (file)
--- a/htdocs/branches_of_interest.txt
+++ b/htdocs/branches_of_interest.txt
@@ -1,3 +1,2 @@
 HEAD
 exim-4_90+fixes
-4.next