X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=nodemanager-vs.spec;h=a58a4e996d3b6b24fcfcf65fd25db436b1591420;hb=d0c6effcab2aa1baed6016bd7edd1339639a1d13;hp=514349bead9db7fca2384bd6133b3cc3a24aae22;hpb=c40748ce15f446462fe7050aaf825cc6e81c6d82;p=nodemanager.git

diff --git a/nodemanager-vs.spec b/nodemanager-vs.spec
index 514349b..a58a4e9 100644
--- a/nodemanager-vs.spec
+++ b/nodemanager-vs.spec
@@ -1,11 +1,11 @@
 # we define this in a separate specfile because we cannot produce all the 3 packages
-# nodemanager-lib nodemanager-vs nodemanager-vs in a single build
+# nodemanager-lib nodemanager-vs nodemanager-lxc in a single build
 
 %define slicefamily %{pldistro}-%{distroname}-%{_arch}
 
 %define name nodemanager-vs
-%define version 2.0
-%define taglevel 37
+%define version 2.1
+%define taglevel 11
 
 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 
@@ -26,14 +26,14 @@ URL: %{SCMURL}
 # old name, when all came as a single package with vserver wired in
 Obsoletes: NodeManager
 
-# Uses function decorators
-Requires: nodemanager-lib
-# vserver-sliceimage or lxc-sliceimage to be added explicitly in nodeimage.pkgs
-Requires: vserver-sliceimage
 # our interface to the vserver patch
 Requires: util-vserver >= 0.30.208-17
-# vserver.py
+# and the planetlab utilities
 Requires: util-vserver-python > 0.3-16
+# the common package for nodemanager
+Requires: nodemanager-lib
+# the vserver-specific tools for using slice images
+Requires: vserver-sliceimage
 
 %description
 nodemanager-vs provides the vserver code for the PlanetLab Node Manager.
@@ -58,3 +58,30 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/NodeManager/
 
 %changelog
+* Wed Sep 05 2012 Andy Bavier <acb@cs.princeton.edu> - nodemanager-2.1-10
+- Change to use new vsh (wrapper for lxcsu)
+
+* Fri Aug 31 2012 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - nodemanager-2.1-9
+- add missing import
+- 2.1-8 is less broken than 2.1-7 for omf-friendly slices, in that the slivers would get created, but the OMF-feature probably won't work as .ssh won't get exposed to the sliver
+
+* 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
+
+* Mon Jul 09 2012 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - nodemanager-2.1-6
+- set LD_PRELOAD for linux-containers nodes
+
+* Thu Jun 28 2012 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - nodemanager-2.1-5
+- first complete version for vs and lxc - functional but not thoroughly tested though
+
+* Tue Jun 26 2012 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - nodemanager-2.1-4
+- split packaging in 3 (lib, lxc, vs)
+- this tag will only work with lxc though
+
+* Tue Jun 26 2012 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - nodemanager-2.0-38
+- split packaging, nodemanager-vs (obsoletes NodeManager) and nodemanager-lib
+