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

[Jes Sorensen]

commit 01a5d9d8e34dc15cfdb8f8512f2710cab03a9e43
Merge: b170c8b c68d736
Author: Jes Sorensen <Jes.Sorensen at redhat.com>
Date:   Mon Jan 30 17:08:17 2012 +0100

    Merge branch 'master' into f15

 mdadm-3.2.3-Add-offroot-argument-to-mdadm.patch    |  101 ++++++++++++++++++++
 mdadm-3.2.3-Add-offroot-argument-to-mdmon.patch    |   79 +++++++++++++++
 ...-with-offroot-if-mdadm-was-launched-with-.patch |   75 +++++++++++++++
 ...getopt_long-to-parse-command-line-options.patch |   97 +++++++++++++++++++
 mdadm.spec                                         |   16 +++-
 5 files changed, 367 insertions(+), 1 deletions(-)
---
diff --cc mdadm.spec
index 35e3163,45c58eb..e389fc9
--- a/mdadm.spec
+++ b/mdadm.spec
@@@ -91,7 -129,14 +101,11 @@@ f
  %dir %{_localstatedir}/run/%{name}/
  %config(noreplace) %{_sysconfdir}/tmpfiles.d/%{name}.conf
  
 -%files sysvinit
 -%{_initrddir}/*
 -
  %changelog
+ * Mon Jan 30 2012 Jes Sorensen <Jes.Sorensen at redhat.com> - 3.2.3-4
+ - Add support for --offroot to mdadm/mdmon
+ - Resolves: bz785739 (rawhide) bz785737 (f16) bz771405 (f15)
+ 
  * Thu Jan 12 2012 Jes Sorensen <Jes.Sorensen at redhat.com> - 3.2.3-3
  - Fix case where we have to retry in case a remove fails due to an array
    being busy