From: Barış Metin <Talip-Baris.Metin@sophia.inria.fr>
Date: Mon, 11 Oct 2010 14:06:05 +0000 (+0200)
Subject: fix merge between onelab and princeton repositories
X-Git-Tag: nodemanager-2.0-20~1
X-Git-Url: http://git.onelab.eu/?p=nodemanager.git;a=commitdiff_plain;h=e6f233023651a7bad3d7522d8db16ecd064cf463

fix merge between onelab and princeton repositories
---

e6f233023651a7bad3d7522d8db16ecd064cf463
diff --cc NodeManager.spec
index b504233,9a725c7..ebf16d4
--- a/NodeManager.spec
+++ b/NodeManager.spec
@@@ -136,11 -136,8 +136,13 @@@ rm -rf $RPM_BUILD_ROO
  /var/lib/
  
  %changelog
 +* Thu Sep 23 2010 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - nodemanager-2.0-19
 +- hotfix - make the UpdateSliceTag for ssh_key really incremental (was storming the API)
 +- sfagids plugin deleted
 +- band-aid patch for lack of GetSliceFamily removed
 +
+ * Mon Aug 23 2010 S.Çağlar Onur <caglar@cs.princeton.edu> - nodemanager-2.0-18
+ 
  * Fri Jul 16 2010 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - nodemanager-2.0-17
  - revert curlwrapper to former forking-curl version
  - fixes in the omf plugin for ssh key location and node hrn