- 10000.20 release

svn-id: @11117

diff --git a/ChangeLog b/ChangeLog
index 716f69fbb6e69953589009ff64772c6c7755d692..94a2d4fca244dda201c9742e4017e1dd261eee03 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2010-01-21 13:45 +0000 [r11116]  Jan Rękorajski <baggins/at/pld-linux.org>
+
+       * geninitrd: - initrd-busybox changed to just busybox
+
+2010-01-20 16:37 +0000 [r11115]  Elan Ruusamäe <glen/at/pld-linux.org>
+
+       * mod-luks.sh: - if "cryptsetup status" returns no device, assume
+         there is no cryptsetup
+
+2010-01-12 11:13 +0000 [r11107-11108]  Elan Ruusamäe <glen/at/pld-linux.org>
+
+       * Makefile: - fix manual page generation
+
+       * Makefile: - 10000.19 release
+
 2010-01-12 10:11 +0000 [r11106]  Elan Ruusamäe <glen/at/pld-linux.org>
 
        * tests/lvmroot.sh, mod-lvm.sh: - allow dash in PV too
@@ -119,7 +134,7 @@
 
        * geninitrd: Really take specified compressor.
 
-2009-08-28 21:26 +0000 [r10505-10506]  Bartłomiej Zimoń <cactus/at/pld-linux.org>
+2009-08-28 21:26 +0000 [r10505-10506]  cactus <cactus/at/pld-linux.org>
 
        * geninitrd: - typo, in decompressor symbol to check
 
@@ -553,7 +568,7 @@
          /dev/hda[a-l] are used) to avoid /dev/hdoc being recognized as
          IDE not LVM
 
-2008-11-29 19:23 +0000 [r10013]  Paweł Zuzelski <pawelz/at/pld-linux.org>
+2008-11-29 19:23 +0000 [r10013]  pawelz <pawelz/at/pld-linux.org>
 
        * geninitrd: - fixed parsing of lvmtoolsversion argument
 
@@ -818,7 +833,7 @@
        * geninitrd: - just use $resume var to avoid confusion with
          tuxonice/suspend2
 
-2008-04-09 21:36 +0000 [r9708]  Kacper Kornet <draenog/at/pld-linux.org>
+2008-04-09 21:36 +0000 [r9708]  draenog <draenog/at/pld-linux.org>
 
        * geninitrd: - kernels with tuxonice use option resume
 

diff --git a/Makefile b/Makefile
index 6ba66c01963f6873432f46b161632e033c7a5e25..8daca608b6058a6f67f73cfac0ffd1970b916765 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 # when making release, make sure you do it as RELEASE document describes
-VERSION                := 10000.19
+VERSION                := 10000.20
 MODS           := ide luks multipath dmraid lvm md blkid udev tuxonice suspend fbsplash condecor bootsplash uvesafb nfs scsi
 FILES_MODS  := $(MODS:%=mod-%.sh)
 FILES          := Makefile geninitrd.sysconfig geninitrd functions $(FILES_MODS) geninitrd.8 geninitrd.8.xml ChangeLog