From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Thu, 21 Jun 2012 08:07:20 +0000 (+0200)
Subject: Merge branch 'master' into lxc_devel - changelog from 2.0-37
X-Git-Tag: nodemanager-2.1-2~1
X-Git-Url: http://git.onelab.eu/?p=nodemanager.git;a=commitdiff_plain;h=dd451f27a57f53eb716aaf3ff9b545953df8882a

Merge branch 'master' into lxc_devel - changelog from 2.0-37
---

dd451f27a57f53eb716aaf3ff9b545953df8882a
diff --cc NodeManager.spec
index 58778e7,a9fe8e8..686ed24
--- a/NodeManager.spec
+++ b/NodeManager.spec
@@@ -134,10 -130,14 +134,16 @@@ rm -rf $RPM_BUILD_ROO
  %{_initrddir}/
  %{_sysconfdir}/logrotate.d/nodemanager
  /var/lib/
 +/bin/sshsh
 +%{python_sitearch}/bwlimit.py*
  
  %changelog
+ * Thu Jun 21 2012 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - nodemanager-2.0-37
+ - refactoring: isolate initscript functionality
+ - aimed at making initscript implementation with lxc straightforward
+ - show stack trace when module loading fails
+ - accounts.py renamed into account.py for consistency
+ 
  * Sun Jun 03 2012 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - nodemanager-2.0-36
  - /var/log/nodemanager shows duration of mainloop