From: Daniel Hokka Zakrisson <dhokka@cs.princeton.edu>
Date: Tue, 14 Dec 2010 20:55:16 +0000 (-0500)
Subject: Merge branch '4.3' of dhozac@git.planet-lab.org:/git/bootmanager into 4.3
X-Git-Tag: bootmanager-4.3-19~1
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=4d7ebcb2f75108f95484a4000cca2489c4ef32b1;hp=c2e73a0cf0a4cf3898014924cff6bb3563691fac;p=bootmanager.git

Merge branch '4.3' of dhozac@git.planet-lab.org:/git/bootmanager into 4.3
---

diff --git a/bootmanager.spec b/bootmanager.spec
index 1e14287..affe1f0 100644
--- a/bootmanager.spec
+++ b/bootmanager.spec
@@ -5,7 +5,7 @@
 
 %define name bootmanager
 %define version 4.3
-%define taglevel 17
+%define taglevel 18
 
 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 
@@ -85,6 +85,11 @@ chkconfig --del monitor-runlevelagent
 /var/www/html/boot/uudecode.gz
 
 %changelog
+* Fri Nov 19 2010 Daniel Hokka Zakrisson <dhokka@cs.princeton.edu> - bootmanager-4.3-18
+- Use resize2fs for resizing.
+- Fix typo for VSERVERS_SIZE.
+- Disable time/count-based fsck.
+
 * Fri Feb 19 2010 S.Çağlar Onur <caglar@cs.princeton.edu> - BootManager-4.3-17
 - merge initrd changes from trunk