From: S.Çağlar Onur <caglar@verivue.com>
Date: Fri, 18 Mar 2011 19:55:59 +0000 (-0400)
Subject: Merge branch '1.8' of ssh://git.planet-lab.org/git/nodemanager into 1.8
X-Git-Tag: nodemanager-1.8-36~1
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=f45b6d4a0184eeccc29a030847d76f1f6f392adf;hp=3f14798d46e163a1955cedc7a833619cf717d4fb;p=nodemanager.git

Merge branch '1.8' of ssh://git.planet-lab.org/git/nodemanager into 1.8
---

diff --git a/NodeManager.spec b/NodeManager.spec
index c4aaa0e..eca66a1 100644
--- a/NodeManager.spec
+++ b/NodeManager.spec
@@ -7,7 +7,7 @@
 
 %define name NodeManager
 %define version 1.8
-%define taglevel 34
+%define taglevel 35
 
 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 
@@ -114,6 +114,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_sysconfdir}/logrotate.d/nm
 
 %changelog
+* Fri Mar 18 2011 S.Çağlar Onur <caglar@verivue.com> - nodemanager-1.8-35
+- cherry-pick initscripts changes from master
+
 * Thu Jan 20 2011 S.Çağlar Onur <caglar@cs.princeton.edu> - nodemanager-1.8-34
 
 * Thu Jan 20 2011 S.Çağlar Onur <caglar@cs.princeton.edu> - nodemanager-1.8-33