X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Monitor.spec;h=b53bf935d97a6816f92894fee91a4bea991fc597;hb=3098b1dfe09855ed5ef2ba2a857d0038f838ebce;hp=5111b0c90ea1834af406ffbc7802cb482a1480c7;hpb=c86492e0be8e45f9aa2f913762dbc0a97ee23e65;p=monitor.git

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 <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