From 3098b1dfe09855ed5ef2ba2a857d0038f838ebce Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Sat, 30 May 2009 10:27:07 +0000 Subject: [PATCH] Tagging module Monitor - Monitor-3.0-11 big merge from the 2.0 branch --- Monitor.spec | 5 ++++- zabbix.spec | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Monitor.spec b/Monitor.spec index 5111b0c..b53bf93 100644 --- a/Monitor.spec +++ b/Monitor.spec @@ -6,7 +6,7 @@ %define name monitor %define version 3.0 -%define taglevel 10 +%define taglevel 11 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}} %global python_sitearch %( python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)" ) @@ -247,6 +247,9 @@ chkconfig --add monitor-runlevelagent chkconfig monitor-runlevelagent on %changelog +* Sat May 30 2009 Thierry Parmentelat - Monitor-3.0-11 +- big merge from the 2.0 branch + * Tue May 26 2009 Thierry Parmentelat - Monitor-3.0-10 - minor improvements in rendering with sortable tables diff --git a/zabbix.spec b/zabbix.spec index c7c7a2d..8b36d65 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -290,6 +290,9 @@ rm -f %{zabbix_logdir}/zabbix_agentd.log %{zabbix_webdir} %changelog +* Sat May 30 2009 Thierry Parmentelat - Monitor-3.0-11 +- big merge from the 2.0 branch + * Tue May 26 2009 Thierry Parmentelat - Monitor-3.0-10 - minor improvements in rendering with sortable tables @@ -378,6 +381,6 @@ rm -f %{zabbix_logdir}/zabbix_agentd.log %define module_current_branch 2.0 -%define taglevel 10 +%define taglevel 11 %define version 3.0 -- 2.43.0