X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=util-vserver-pl.spec;h=03cfb59bfa34148f79ed8dcac2f84ec379f7af22;hb=62ddada3884e28211092c6842610bd2e95322168;hp=bcb2a7d0505771bddcf31821ed80ba7ae9c7d7f0;hpb=9ed9012cb811917b7ae83599e5f92b1942daf7c3;p=util-vserver-pl.git

diff --git a/util-vserver-pl.spec b/util-vserver-pl.spec
index bcb2a7d..03cfb59 100644
--- a/util-vserver-pl.spec
+++ b/util-vserver-pl.spec
@@ -4,8 +4,8 @@
 %define url $URL$
 
 %define name	util-vserver-pl
-%define version 0.3
-%define taglevel 25
+%define version 0.4
+%define taglevel 4
 
 %define release	%{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 
@@ -103,6 +103,16 @@ rm -fr %{buildroot}
 %{_mandir}/man8/vsh.8*
 
 %changelog
+* Mon May 10 2010 Talip Baris Metin <Talip-Baris.Metin@sophia.inria.fr> - util-vserver-pl-0.4-4
+- merged trellis branch to trunk
+
+* Wed Feb 24 2010 Marc Fiuczynski <mef@cs.princeton.edu> - util-vserver-pl-0.3-27
+- Need to print the exception string as part of the self.log, or else we
+- get a wrong number of argument error.
+
+* Wed Feb 24 2010 Daniel Hokka Zakrisson <daniel@hozac.com> - util-vserver-pl-0.3-26
+- This is outputted for some reason.
+
 * Tue Feb 23 2010 Daniel Hokka Zakrisson <daniel@hozac.com> - util-vserver-pl-0.3-25
 - Don't set bwlimits if they're disabled.
 - Don't cleanup /var of running slivers.
@@ -192,3 +202,5 @@ rm -fr %{buildroot}
 
 * Fri Nov 30 2007 Daniel Hokka Zakrisson <daniel@hozac.com> - 0.1-1
 - Initial release
+
+%define module_current_branch 0.3