From: root <root@cassidy.cs.princeton.edu>
Date: Fri, 3 Dec 2010 09:32:01 +0000 (-0500)
Subject: Merge commit 'origin/master'
X-Git-Tag: plcapi-5.0-21~5
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=e44a32f614709d4859bb65b3992b0fc5d1efd34b;hp=a9a0594771b4cc07da8dcb752e90ba1559ebf445;p=plcapi.git

Merge commit 'origin/master'
---

diff --git a/PLCAPI.spec b/PLCAPI.spec
index 9910408..6039fda 100644
--- a/PLCAPI.spec
+++ b/PLCAPI.spec
@@ -2,7 +2,7 @@
 
 %define name PLCAPI
 %define version 5.0
-%define taglevel 19
+%define taglevel 20
 
 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 
@@ -146,6 +146,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec 03 2010 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - plcapi-5.0-20
+- fix the roles for ssh_key and hmac tags
+
 * Wed Dec 01 2010 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - plcapi-5.0-19
 - tag permissions system based on roles and not min_role_ids
 - accessors simplified accordingly (no more min_role_id)