[mdadm/f15: 2/2] Merge branch 'master' into f15

[Jes Sorensen]

commit 7d99d7db51367567db723cd7431827d611365c69
Merge: 211a1e1 d8666fc
Author: Jes Sorensen <Jes.Sorensen at redhat.com>
Date:   Thu May 10 14:09:57 2012 +0200

    Merge branch 'master' into f15

 mdadm.conf |    2 +-
 mdadm.spec |    6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)
---
diff --cc mdadm.spec
index 94892c7,9eb6b97..fe24904
--- a/mdadm.spec
+++ b/mdadm.spec
@@@ -96,7 -124,14 +96,11 @@@ f
  %dir %{_localstatedir}/run/%{name}/
  %config(noreplace) %{_sysconfdir}/tmpfiles.d/%{name}.conf
  
 -%files sysvinit
 -%{_initrddir}/*
 -
  %changelog
+ * Thu May 10 2012 Jes Sorensen <Jes.Sorensen at redhat.com> - 3.2.4-2
+ - Fix mdadm.conf to use 'd' for /var/run/mdadm creation, to avoid the
+   map file getting deleted during boot.
+ 
  * Thu May 10 2012 Jes Sorensen <Jes.Sorensen at redhat.com> - 3.2.4-1
  - Upgrade to mdadm-3.2.4
  - Resolves bz820534 (rawhide) bz820527 (f17) bz820531 (f16) bz820532 (f15)