X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=zabbix.spec;h=0eb0c6efc13f08e4267d00d25c159d3c39a74f6d;hb=7e1b0434bd1f865f7e9d8dff1cebd87d07a8d65d;hp=8a19c9b47d13f0334f2335f4304fe2f77f800299;hpb=486326759a86f1315d93aeaccf6e2641af2bd9d9;p=monitor.git

diff --git a/zabbix.spec b/zabbix.spec
index 8a19c9b..0eb0c6e 100644
--- a/zabbix.spec
+++ b/zabbix.spec
@@ -290,6 +290,9 @@ rm -f %{zabbix_logdir}/zabbix_agentd.log
 %{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.
@@ -348,6 +351,6 @@ rm -f %{zabbix_logdir}/zabbix_agentd.log
 
 %define module_current_branch 2.0
 
-%define taglevel 1
+%define taglevel 2
 
 %define version 3.0