Resolved upstream-conflicts:

html/pages/apps.inc.php
	includes/polling/unix-agent.inc.php
This commit is contained in:
f0o
2015-01-18 06:37:22 +00:00
7 changed files with 216 additions and 1 deletions

View File

@@ -43,6 +43,7 @@ if ($device['os_group'] == "unix")
if ($section == "apache") { $sa = "app"; $sb = "apache"; }
if ($section == "mysql") { $sa = "app"; $sb = "mysql"; }
if ($section == "nginx") { $sa = "app"; $sb = "nginx"; }
if ($section == "bind") { $sa = "app"; $sb = "bind"; }
if ($section == "tinydns") { $sa = "app"; $sb = "tinydns"; }
# if ($section == "drbd") { $sa = "app"; $sb = "drbd"; }