release 118118

3 files changed, 32 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index d317b977..fac6b5f2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,30 @@
+Summary of changes from v117 to v118
+============================================
+
+Daniel Drake (1):
+      doc: update "writing udev rules"
+
+Hannes Reinecke (1):
+      volume_id: LVM - add uuid
+
+Kay Sievers (9):
+      remove udevstart
+      rules_generator: do not create rules with insufficient matches
+      man: udevadm settle - mention 180 seconds default timeout
+      libvolume_id: squashfs - add endianess support for LZMA compression
+      rules: add AOE rule
+      volume_id: md - add metadata minor version
+      volume_id: run only once into a timeout for unreadable devices
+      create_floppy_devices: fix logic for more than one floppy device
+      volume_id: also add readable check to probe_all()
+
+Matthias Schwarzott (1):
+      rules: Gentoo update
+
+Michael Prokop (1):
+      libvolume_id: squashfs+LZMA compression detection
+
+
 Summary of changes from v116 to v117
 ============================================
 
diff --git a/Makefile b/Makefile
index 1998c851..6c7f139e 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,7 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
 
-VERSION = 117
+VERSION = 118
 
 # set this to make use of syslog
 USE_LOG = true
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 249ec959..58564edc 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -1,7 +1,9 @@
 udev 118
 ========
-udevstart is removed from the tree, it did not get installed for
-a long time now and is long replaced by trigger and settle.
+Bugfixes.
+
+Udevstart is removed from the tree, it did not get installed for
+a long time now, and is long replaced by trigger and settle.
 
 udev 117
 ========