--- trunk/grubby/ChangeLog	2012/02/18 00:56:17	1724
+++ trunk/grubby/ChangeLog	2012/02/18 01:03:32	1739
@@ -1,5 +1,53 @@
 2012-02-18  Niels Rogalla <niro@magellan-linux.de>
 
+	* [r1738] VERSION:
+	  -version 8.7
+	* [r1737] test.sh, test/results/debug[ADD],
+	  test/results/debug/g2.1[ADD], test/results/debug/g2.1.2[ADD]:
+	  Add a test case for --debug.
+	  
+	  Make sure --debug works as expected in both successful and failed
+	  attempts.
+	* [r1736] grubby.8, grubby.c:
+	  grubby: Add --debug option to annotate "suitable template"
+	  failures
+	  
+	  Today, when grubby fails with "no suitable template found" the
+	  user
+	  has no idea why that might be. These can fail for several
+	  reasons.
+	  So add a --debug option to print out the line in grubby.c where
+	  it
+	  failed, a text message describing the failure, and a copy of the
+	  bootloader entry that failed, to aid investigation.
+	  
+	  Signed-off-by: Eric Sandeen <sandeen@redhat.com>
+	* [r1734] ChangeLog:
+	  updated ChangeLog
+	* [r1733] VERSION:
+	  -version 8.6
+	* [r1732] test/results/remove/g2-1.4:
+	  Fix another test broken by 4bb88f93e6c7cf432e354a164fce8743794a
+	* [r1730] ChangeLog:
+	  updated ChangeLog
+	* [r1729] VERSION:
+	  -version 8.5
+	* [r1728] new-kernel-pkg:
+	  Don't hardcode dracut path. (#768645)
+	  
+	  dracut moved from /sbin to /usr/bin, so fix that, but also it's
+	  pointless to hardcode what's in PATH.
+	* [r1727] grubby.c, test.sh, test/results/remove/g2-1.4[ADD]:
+	  Use dummy entries for text following kernel entries so it is
+	  preserved
+	  (#744717)
+	  
+	  Signed-off-by: Adam Williamson <awilliam@redhat.com>
+	* [r1726] test/results/defaulttitle/g2.1:
+	  Fix up one test result for changes from
+	  4bb88f93e6c7cf432e354a164fce8743794a84a5
+	* [r1724] ChangeLog:
+	  updated ChangeLog
 	* [r1723] VERSION:
 	  -version 8.4
 	* [r1722] grubby.c, test/grub2.1, test/results/add/g2-1.1,