From: Marco Yuen <marcoy@gmail.com>
Date: Thu, 15 Dec 2011 16:28:05 +0000 (-0500)
Subject: Merge branch 'master' into lxc_devel
X-Git-Tag: nodemanager-2.1-1~16^2~3
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=ced3e87fd21b74d9a660fbac56141ba69501ba75;p=nodemanager.git

Merge branch 'master' into lxc_devel
---

ced3e87fd21b74d9a660fbac56141ba69501ba75
diff --cc NodeManager.spec
index b9ea66f,6320d71..9ed035a
--- a/NodeManager.spec
+++ b/NodeManager.spec
@@@ -130,9 -129,12 +130,13 @@@ rm -rf $RPM_BUILD_ROO
  %{_initrddir}/
  %{_sysconfdir}/logrotate.d/nodemanager
  /var/lib/
 +/bin/sshsh
  
  %changelog
+ * Fri Dec 09 2011 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - nodemanager-2.0-34
+ - Added memory scheduling to core scheduler
+ - Core scheduler will now attempt to schedule cores on the same CPU to a slice, if a slice uses multiple cores
+ 
  * Thu Jul 07 2011 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - nodemanager-2.0-33
  - tweaked log policy for the core scheduler
  - curlwrapper has an optional verbose mode