[checkmk-commits] Fix botched merge

Module: check_mk Branch: master Commit: 23730fcb57a1d9501ed2dbf27f8ddd9869ee01ab URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=23730fcb57a1d9… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Jan 25 13:24:03 2017 +0100 Fix botched merge Change-Id: I6380d6c07cd3e8b6e58c5f14b1cfae9c0ee7fed6 --- checks/jolokia_metrics | 1 + 1 file changed, 1 insertion(+) diff --git a/checks/jolokia_metrics b/checks/jolokia_metrics index 5879ad3..8af0feb 100644 --- a/checks/jolokia_metrics +++ b/checks/jolokia_metrics @@ -731,6 +731,7 @@ check_info["jolokia_metrics.threads"] = { "inventory_function" : lambda i: inventory_jolokia_metrics(i, "threads"), "group" : "jvm_threads", "has_perfdata" : True, +} #. # .--Uptime--------------------------------------------------------------.