Module: check_mk
Branch: master
Commit: 6bd10a50f5571ac0346157ff2a1b756e9a024f83
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6bd10a50f5571a…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Fri Dec 20 14:18:27 2013 +0100
Fixed merge conflict
---
web/htdocs/wato.py | 13 -------------
1 file changed, 13 deletions(-)
diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py
index 3456d49..9cdcc1e 100644
--- a/web/htdocs/wato.py
+++ b/web/htdocs/wato.py
@@ -2450,18 +2450,6 @@ def mode_inventory(phase, firsttime):
table.sort()
active_checks = {}
new_target = "folder"
-<<<<<<< HEAD
- for st, ct, checkgroup, item, paramstring, params, descr, state, output,
perfdata in table:
- if (html.has_var("_cleanup") or
html.has_var("_fixall")) \
- and st in [ "vanished", "obsolete" ]:
- pass
- elif (html.has_var("_activate_all") or
html.has_var("_fixall")) \
- and st == "new":
- active_checks[(ct, item)] = paramstring
- else:
- varname = "_%s_%s" % (ct, html.varencode(item))
- if html.var(varname, "") != "":
-=======
if html.var("_refresh"):
counts, failed_hosts = check_mk_automation(host[".siteid"],
"inventory", [ "@scan", "refresh", hostname ])
@@ -2486,7 +2474,6 @@ def mode_inventory(phase, firsttime):
if html.var(varname, "") != "":
active_checks[(ct, item)] = paramstring
if st == "clustered":
->>>>>>> 29799d8... FIX Fixed numbers shown in log entries of bulk
inventory
active_checks[(ct, item)] = paramstring
if st == "clustered":
active_checks[(ct, item)] = paramstring