[checkmk-commits] Check_MK Git: check_mk: Revert " #2395 FIX Fix conflict with legacy check_mk-agent-logwatch package in default RPM packages "

Module: check_mk Branch: master Commit: 323a9d8dd588669d611115a284fcbf9b2ac5d80b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=323a9d8dd58866… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 3 16:54:41 2015 +0200 Revert "#2395 FIX Fix conflict with legacy check_mk-agent-logwatch package in default RPM packages" This reverts commit c586a74b5797647b4e138f2fb738d4c09b595ac9. --- .werks/2395 | 16 ---------------- ChangeLog | 1 - agents/check-mk-agent.spec | 2 +- 3 files changed, 1 insertion(+), 18 deletions(-) diff --git a/.werks/2395 b/.werks/2395 deleted file mode 100644 index b1a188e..0000000 --- a/.werks/2395 +++ /dev/null @@ -1,16 +0,0 @@ -Title: Fix conflict with legacy check_mk-agent-logwatch package in default RPM packages -Level: 1 -Component: checks -Compatible: compat -Version: 1.2.7i3 -Date: 1435925490 -Class: fix - -When you install the default Check_MK Agent RPM package it will trigger the removal of -the previously installed check-mk-agent, check_mk-agent and check_mk-agent-logwatch -RPM packages. Please note that this agent does not ship the mk_logwatch plugin, so -you will need to install the mk_logwatch plugin in your own. - -If you want to have the Check_MK Agent RPM package contain the plugins you need and -are a happy user with access to the Check_MK Enterprise Edition, you can use the -Agent Bakery to create your custom packed RPM packages. diff --git a/ChangeLog b/ChangeLog index 165d850..714396b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -29,7 +29,6 @@ * 2320 FIX: winperf_msx_queues: no longer crashes in service discovery if there are no msx queues available * 2321 FIX: process discovery: fixed exception during service discovery when no explicit process matching was set... * 2394 FIX: megaraid_ldisks: Is now supporting LSI CacheCade drives - * 2395 FIX: Fix conflict with legacy check_mk-agent-logwatch package in default RPM packages... Multisite: * 2385 SEC: Fixed possible reflected XSS on all GUI pages where users can produce unhandled exceptions... diff --git a/agents/check-mk-agent.spec b/agents/check-mk-agent.spec index 5403524..7b950b3 100644 --- a/agents/check-mk-agent.spec +++ b/agents/check-mk-agent.spec @@ -34,7 +34,7 @@ BuildRoot: %{_topdir}/buildroot AutoReq: off AutoProv: off BuildArch: noarch -Obsoletes: check_mk-agent check_mk-agent-logwatch +Obsoletes: check_mk-agent %description The Check_MK Agent uses xinetd to provide information about the system