Merge commit 'v0.10.4' into stable-0.10qemu-kvm-0.10.4

* commit 'v0.10.4':
  Update for 0.10.4 release

2 files changed, 9 insertions, 1 deletions

diff --git a/Changelog b/Changelog
index 4e6f1584d..dec0d151d 100644
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,11 @@
+version 0.10.4:
+  - Improve block range checks to remove integer overflow (Kevin Wolf)
+  - e1000: do not re-init PCI config space 0 (Amit Shah)
+  - fix AIO deletion race (Alex Graf)
+  - reset option roms on reboot (Glauber Costa)
+  - fix qcow2 corruption in cluster freeing (Gleb Natapov)
+  - Enable power button event generation (Gleb Natapov)
+
 version 0.10.3:
   - fix AIO cancellations (Avi Kivity)
   - fix live migration error path on incoming
diff --git a/VERSION b/VERSION
index a3f5a8ed4..9b40aa6c2 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.10.3
+0.10.4