Merge branch 'master' of ssh://git.onelab.eu/git/nodemanager

diff --combined NodeManager.spec
index 20548d8,d011eac..1106bc4
--- 1/NodeManager.spec
--- 2/NodeManager.spec
+++ b/NodeManager.spec
@@@ -1,8 -1,13 +1,8 @@@
 -#
 -# $Id$
 -#
 -%define url $URL$
 -
  %define slicefamily %{pldistro}-%{distroname}-%{_arch}
  
  %define name NodeManager
  %define version 2.0
- %define taglevel 24
+ %define taglevel 25
  
  %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
  
@@@ -18,7 -23,7 +18,7 @@@ BuildRoot: %{_tmppath}/%{name}-%{versio
  Vendor: PlanetLab
  Packager: PlanetLab Central <support@planet-lab.org>
  Distribution: PlanetLab %{plrelease}
 -URL: %(echo %{url} | cut -d ' ' -f 2)
 +URL: %{SCMURL}
  
  # not possible because of forward_api_calls
  #BuildArch: noarch
@@@ -131,6 -136,9 +131,9 @@@ rm -rf $RPM_BUILD_ROO
  /var/lib/
  
  %changelog
+ * Tue Jan 04 2011 S.Çağlar Onur <caglar@cs.princeton.edu> - nodemanager-2.0-25
+ - Catch all exceptions for sfa plugin
+ 
  * Wed Dec 22 2010 S.Çağlar Onur <caglar@cs.princeton.edu> - nodemanager-2.0-24
  - Handle exception AttributeError: ComponentAPI instance has no attribute 'get_registry'