Merge branch 'master' of ssh://github.com/opnsense/core

src/etc/inc/system.inc

@@ -740,12 +740,6 @@ EOD;
 			$syslogconf .= system_syslogd_get_remote_servers($syslogcfg, "*.*");
 		}
 
-		if (isset($syslogcfg['zmqserver'])) {
-				$syslogconf .= <<<EOD
-*.*								^{$syslogcfg['zmqserver']}
-
-EOD;
-		}
 		/* write syslog.conf */
 		if (!@file_put_contents("/var/etc/syslog.conf", $syslogconf)) {
 			printf(gettext("Error: cannot open syslog.conf in system_syslogd_start().%s"), "\n");

src/opnsense/mvc/app/views/OPNsense/Core/firmware.volt

@@ -96,9 +96,9 @@ POSSIBILITY OF SUCH DAMAGE.
 
         ajaxCall('/api/core/firmware/upgrade',{upgrade:$.upgrade_action},function() {
             $("#upgrade_progress").removeClass("fa fa-spinner fa-pulse");
+            $('#updatelist').empty();
             setTimeout(trackStatus, 1000) ;
         });
-        $('#updatelist').empty();
     }
 
     /**