X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=zabbix.spec;h=e357383ec85999d0286ef761a497fac67deecb66;hb=3dbc6ae5bbb228a756fe4be7373472e94acb511a;hp=c7c7a2d26be9d240fe93f6be2da790ca32710315;hpb=c86492e0be8e45f9aa2f913762dbc0a97ee23e65;p=monitor.git

diff --git a/zabbix.spec b/zabbix.spec
index c7c7a2d..e357383 100644
--- a/zabbix.spec
+++ b/zabbix.spec
@@ -290,6 +290,13 @@ rm -f %{zabbix_logdir}/zabbix_agentd.log
 %{zabbix_webdir}
 
 %changelog
+* Tue Jun 02 2009 Stephen Soltesz <soltesz@cs.princeton.edu> - Monitor-3.0-12
+- tag of latest changes.
+- need to test end to end.
+
+* Sat May 30 2009 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - Monitor-3.0-11
+- big merge from the 2.0 branch
+
 * Tue May 26 2009 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - Monitor-3.0-10
 - minor improvements in rendering with sortable tables
 
@@ -378,6 +385,6 @@ rm -f %{zabbix_logdir}/zabbix_agentd.log
 
 %define module_current_branch 2.0
 
-%define taglevel 10
+%define taglevel 12
 
 %define version 3.0