X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=zabbix.spec;h=8b36d6506aee7f5ac7019c799335527b0f9e3374;hb=3f2acbd8b7761dae4bb02fedd3557e1003cafb43;hp=e837ff0d592a46b935e1ed03e05c1f98ae8a8d00;hpb=ae2094f663ad8ac89daedfecb3c44bc6d41753a1;p=monitor.git

diff --git a/zabbix.spec b/zabbix.spec
index e837ff0..8b36d65 100644
--- a/zabbix.spec
+++ b/zabbix.spec
@@ -290,6 +290,12 @@ rm -f %{zabbix_logdir}/zabbix_agentd.log
 %{zabbix_webdir}
 
 %changelog
+* 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
+
 * Tue May 19 2009 Baris Metin <Talip-Baris.Metin@sophia.inria.fr> - Monitor-3.0-9
 
 * Fri May 15 2009 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - Monitor-3.0-8
@@ -375,6 +381,6 @@ rm -f %{zabbix_logdir}/zabbix_agentd.log
 
 %define module_current_branch 2.0
 
-%define taglevel 9
+%define taglevel 11
 
 %define version 3.0