Merge branch 'master' into lxc_devel

Conflicts:
	NodeManager.spec
	api.py
	slivermanager.py

diff --cc NodeManager.spec
index fd038c6,4b54bfb..d0e7f93
--- 1/NodeManager.spec
--- 2/NodeManager.spec
+++ b/NodeManager.spec
@@@ -134,16 -130,13 +134,19 @@@ rm -rf $RPM_BUILD_ROO
  %{_initrddir}/
  %{_sysconfdir}/logrotate.d/nodemanager
  /var/lib/
 +/bin/sshsh
 +%{python_sitearch}/bwlimit.py*
  
  %changelog
- * Fri Jan 13 2012 Marco Yuen <marcoy@cs.princeton.edu> - nodemanager-2.0-34
- - Install bwlimit.py to the python site directory.
 +* Fri Apr 13 2012 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - nodemanager-2.1-1
 +- first working draft for dealing with libvirt/lxc on f16 nodes
 +- not expected to work with mainline nodes (use 2.0 for that for now)
 +
+ * Sun Jun 03 2012 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - nodemanager-2.0-36
+ - /var/log/nodemanager shows duration of mainloop
+ 
+ * Fri Apr 13 2012 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - nodemanager-2.0-35
+ - remove Requires to deprecated vserver-* rpms, use sliceimage-* instead
  
  * Fri Dec 09 2011 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - nodemanager-2.0-34
  - Added memory scheduling to core scheduler

diff --cc api_calls.py
Simple merge

diff --cc coresched.py
Simple merge

diff --cc initscripts/nm
index 6c41ffc,12bb5a9..13f30ed
--- 1/initscripts/nm
--- 2/initscripts/nm
+++ b/initscripts/nm
@@@ -1,11 -1,8 +1,8 @@@
  #!/bin/bash
  #
- # $Id$
- # $URL$
- #
  # nm       Starts and stops Node Manager daemon
  #
 -# chkconfig: 3 86 26
 +# chkconfig: 3 97 26
  # description: Starts and stops Node Manager daemon
  #
  

diff --cc plugins/codemux.py
Simple merge

diff --cc setup.py
Simple merge

diff --cc sliver_vs.py
Simple merge

diff --cc slivermanager.py
index 6264571,565e05d..d118fff
--- 1/slivermanager.py
--- 2/slivermanager.py
+++ b/slivermanager.py
@@@ -14,9 -14,9 +14,9 @@@ import tim
  import logger
  import api, api_calls
  import database
- import accounts
+ import account
  import controller
 -import sliver_vs
 +import sliver_lxc
  
  try: from bwlimit import bwmin, bwmax
  except ImportError: bwmin, bwmax = 8, 1000*1000*1000
@@@ -205,13 -205,11 +205,13 @@@ def deliver_ticket(data)
      return GetSlivers(data, fullupdate=False)
  
  def start():
 -    for resname, default_amount in sliver_vs.DEFAULT_ALLOCATION.iteritems():
 -        DEFAULT_ALLOCATION[resname]=default_amount
 +    # No default allocation values for LXC yet, think if its necessary given
 +    # that they are also default allocation values in this module
 +    #for resname, default_amount in sliver_vs.DEFAULT_ALLOCATION.iteritems():
 +    #    DEFAULT_ALLOCATION[resname]=default_amount
  
-     accounts.register_class(sliver_lxc.Sliver_LXC)
-     accounts.register_class(controller.Controller)
+     account.register_class(sliver_vs.Sliver_VS)
+     account.register_class(controller.Controller)
      database.start()
      api_calls.deliver_ticket = deliver_ticket
      api.start()

diff --cc tools.py
Simple merge