Merge branch 'master' into funcaspect

diff --combined PLCAPI.spec
index c305b6e,b9a230a..e9d036d
--- 1/PLCAPI.spec
--- 2/PLCAPI.spec
+++ b/PLCAPI.spec
@@@ -1,6 -1,6 +1,6 @@@
  %define name PLCAPI
  %define version 5.0
- %define taglevel 24
+ %define taglevel 30
  
  %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
  
@@@ -44,6 -44,7 +44,7 @@@ Requires: python-lda
  # for memcache
  Requires: python-memcached
  Requires: memcached
+ Requires: Django
  ### avoid having yum complain about updates, as stuff is moving around
  # plc.d/api
  Conflicts: MyPLC <= 4.3
@@@ -121,12 -122,6 +122,12 @@@ mkdir -p $RPM_BUILD_ROOT/var/log/om
  touch $RPM_BUILD_ROOT/var/log/plc_api_ratelimit.log
  chown apache:apache $RPM_BUILD_ROOT/var/log/plc_api_ratelimit.log
  
 +# Create func directories
 +mkdir -p $RPM_BUILD_ROOT/var/www/html/func
 +mkdir -p $RPM_BUILD_ROOT/var/log/funcaspect/
 +chmod apache:apache $RPM_BUILD_ROOT/var/www/html/func
 +chmod apache:apache $RPM_BUILD_ROOT/var/log/funcaspect/
 +
  %clean
  rm -rf $RPM_BUILD_ROOT
  
@@@ -150,6 -145,34 +151,34 @@@
  
  
  %changelog
+ * Wed Mar 09 2011 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - plcapi-5.0-30
+ - working draft for GetSliceSshKeys
+ 
+ * Thu Feb 17 2011 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - plcapi-5.0-29
+ - trash getbootmedium tmp file if already exists but is longer than 5 minutes old
+ - (this is for people who cancel their download)
+ 
+ * Fri Feb 04 2011 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - plcapi-5.0-28
+ - fix db-config sequence : accessors step now merged in, and occurs at the right time
+ - db-config also more robust
+ - no more explicit 'accessors' step in plc.d
+ 
+ * Thu Feb 03 2011 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - plcapi-5.0-27
+ - session auth: do *not* delete session when node runs a method that does not have 'node' role
+ - session auth: remove support for bootonce in old boot CDs
+ - give a reason when caller_may_write_slice_tag fails
+ - remove ugly hack that was setting 'vref' to 'omf' - need to set both tags now
+ 
+ * Tue Feb 01 2011 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - plcapi-5.0-26
+ - SetSliceVref needed the node role
+ - protect GetSliceFamily
+ - Fix bugs in tag authorizations
+ 
+ * Sun Jan 23 2011 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - plcapi-5.0-25
+ - altered checking of optional fields in Interfaces
+ - UpdateTagType more picky on inputs - msg when trying to set roles, which is not supported
+ - has pyxml and python-simplejson as new deps
+ 
  * Wed Dec 08 2010 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - plcapi-5.0-24
  - tweak doc extraction for fedora14