Merge branch 'master' into f24

2016-05-02 16:14:18 -04:00 · 2016-05-02 16:14:18 -04:00 · dd1abadcd8
parent 14f36a81e1 bc7ce050b0
commit dd1abadcd8
2 changed files with 6 additions and 2 deletions
--- a/qemu.spec
+++ b/qemu.spec
@ -39,7 +39,7 @@
 %endif

 # Release candidate version tracking
-%global rcver rc3
+%global rcver rc4
 %if 0%{?rcver:1}
 %global rcstr -%{rcver}
 %endif
@ -1192,6 +1192,10 @@ getent passwd qemu >/dev/null || \


 %changelog
+* Mon May 02 2016 Cole Robinson <crobinso@redhat.com> 2:2.6.0-0.2.rc4
+- Rebased to version 2.6.0-rc4
+- Fix test suite on big endian hosts (bz 1330174)
+
 * Mon Apr 25 2016 Cole Robinson <crobinso@redhat.com> - 2:2.6.0-0.2.rc3
 - Rebuild to pick up spice GL support

--- a/2
+++ b/2
@ -1 +1 @@
-12b7fea35ec80d7486f303fab15e47c9  qemu-2.6.0-rc3.tar.bz2
+f3363382105c533520b6fa3890843134  qemu-2.6.0-rc4.tar.bz2