From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Fri, 31 Aug 2012 16:06:36 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/nodemanager
X-Git-Tag: nodemanager-2.1-9~1
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=fccf8b1e3c357c14d6f3229bd0d5c0c48d65e21a;hp=cabdd946793b35b2fcaff5ee2ffec4a1644d8391;p=nodemanager.git

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

diff --git a/nodemanager-lib.spec b/nodemanager-lib.spec
index c0ca0bd..982d179 100644
--- a/nodemanager-lib.spec
+++ b/nodemanager-lib.spec
@@ -2,7 +2,7 @@
 
 %define name nodemanager-lib
 %define version 2.1
-%define taglevel 7
+%define taglevel 8
 
 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 %global python_sitearch %( python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)" )
@@ -132,6 +132,10 @@ rm -rf $RPM_BUILD_ROOT
 /bin/sshsh
 
 %changelog
+* Thu Aug 30 2012 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - nodemanager-2.1-8
+- tag 2.1-7 was broken for OMF-friendly slices
+- expose_ssh_dir was erroneously defined on the Worker class
+
 * Thu Jul 19 2012 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - nodemanager-2.1-7
 - bwlimitlxc now ships with plnode-utils
 
diff --git a/nodemanager-lxc.spec b/nodemanager-lxc.spec
index 2ad64d8..d92cf2b 100644
--- a/nodemanager-lxc.spec
+++ b/nodemanager-lxc.spec
@@ -5,7 +5,7 @@
 
 %define name nodemanager-lxc
 %define version 2.1
-%define taglevel 7
+%define taglevel 8
 
 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 
@@ -56,6 +56,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/NodeManager/
 
 %changelog
+* Thu Aug 30 2012 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - nodemanager-2.1-8
+- tag 2.1-7 was broken for OMF-friendly slices
+- expose_ssh_dir was erroneously defined on the Worker class
+
 * Thu Jul 19 2012 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - nodemanager-2.1-7
 - bwlimitlxc now ships with plnode-utils
 
diff --git a/nodemanager-vs.spec b/nodemanager-vs.spec
index e64e01e..cf18154 100644
--- a/nodemanager-vs.spec
+++ b/nodemanager-vs.spec
@@ -5,7 +5,7 @@
 
 %define name nodemanager-vs
 %define version 2.1
-%define taglevel 7
+%define taglevel 8
 
 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 
@@ -58,6 +58,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/NodeManager/
 
 %changelog
+* Thu Aug 30 2012 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - nodemanager-2.1-8
+- tag 2.1-7 was broken for OMF-friendly slices
+- expose_ssh_dir was erroneously defined on the Worker class
+
 * Thu Jul 19 2012 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - nodemanager-2.1-7
 - bwlimitlxc now ships with plnode-utils