From: root <root@blitz.inria.fr>
Date: Thu, 2 Sep 2010 14:23:02 +0000 (+0200)
Subject: Merge commit 'local_master/master'
X-Git-Tag: plcapi-5.0-17~4
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=d605bcab2509fc2f9c6c5f1fae740d0e8c061a62;hp=-c;p=plcapi.git

Merge commit 'local_master/master'
---

d605bcab2509fc2f9c6c5f1fae740d0e8c061a62
diff --combined PLCAPI.spec
index 0963502,4442ad6..5ff7915
--- a/PLCAPI.spec
+++ b/PLCAPI.spec
@@@ -6,7 -6,7 +6,7 @@@
  
  %define name PLCAPI
  %define version 5.0
- %define taglevel 15
+ %define taglevel 16
  
  %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
  
@@@ -38,7 -38,6 +38,7 @@@ Requires: mod_pytho
  Requires: mod_wsgi
  Requires: mod_ssl
  Requires: SOAPpy
 +Requires: python-simplejson
  # for the RebootNodeWithPCU method
  Requires: pcucontrol >= 1.0-6
  # for OMF integration
@@@ -143,6 -142,10 +143,10 @@@ rm -rf $RPM_BUILD_ROO
  
  
  %changelog
+ * Wed Sep 01 2010 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - plcapi-5.0-16
+ - set accessors return the new value
+ - tweaks in the pubsub groups management
+ 
  * Wed Jul 28 2010 S.Çağlar Onur <caglar@cs.princeton.edu> - plcapi-5.0-15
  - convert hostnames to lower case and use ILIKE instead of LIKE