Tagging module Monitor - Monitor-3.0-2

merge from 2.0, remove more zabbix code, simplify install, etc.

diff --git a/Monitor.spec b/Monitor.spec
index 5e26e98..8554a78 100644 (file)
--- a/Monitor.spec
+++ b/Monitor.spec
@@ -6,7 +6,7 @@
 
 %define name monitor
 %define version 3.0
 
 %define name monitor
 %define version 3.0

-%define taglevel 1
+%define taglevel 2

 
 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 %global python_sitearch        %( python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)" )
 
 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 %global python_sitearch        %( python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)" )


@@ -246,6 +246,9 @@ chkconfig --add monitor-runlevelagent
 chkconfig monitor-runlevelagent on
 
 %changelog
 chkconfig monitor-runlevelagent on
 
 %changelog

+* Mon Apr 27 2009 Stephen Soltesz <soltesz@cs.princeton.edu> - Monitor-3.0-2
+- merge from 2.0, remove more zabbix code, simplify install, etc.
+

 * Thu Apr 16 2009 Stephen Soltesz <soltesz@cs.princeton.edu> - Monitor-3.0-1
 - major merge from 2.0 branch.
 - ready to be updated with 4.3 and web changes.
 * Thu Apr 16 2009 Stephen Soltesz <soltesz@cs.princeton.edu> - Monitor-3.0-1
 - major merge from 2.0 branch.
 - ready to be updated with 4.3 and web changes.

diff --git a/zabbix.spec b/zabbix.spec
index 8a19c9b..0eb0c6e 100644 (file)
--- a/zabbix.spec
+++ b/zabbix.spec
@@ -290,6 +290,9 @@ rm -f %{zabbix_logdir}/zabbix_agentd.log
 %{zabbix_webdir}
 
 %changelog
 %{zabbix_webdir}
 
 %changelog

+* Mon Apr 27 2009 Stephen Soltesz <soltesz@cs.princeton.edu> - Monitor-3.0-2
+- merge from 2.0, remove more zabbix code, simplify install, etc.
+

 * Thu Apr 16 2009 Stephen Soltesz <soltesz@cs.princeton.edu> - Monitor-3.0-1
 - major merge from 2.0 branch.
 - ready to be updated with 4.3 and web changes.
 * Thu Apr 16 2009 Stephen Soltesz <soltesz@cs.princeton.edu> - Monitor-3.0-1
 - major merge from 2.0 branch.
 - ready to be updated with 4.3 and web changes.


@@ -348,6 +351,6 @@ rm -f %{zabbix_logdir}/zabbix_agentd.log
 
 %define module_current_branch 2.0
 
 
 %define module_current_branch 2.0
 

-%define taglevel 1
+%define taglevel 2

 
 %define version 3.0
 
 %define version 3.0