[btrfs-progs: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/btrfs-progs

[Josef Bacik]

commit 737b74dac5cb9a79faabd3f1ca8bf110475e7e81
Merge: 0124baa 089650c
Author: Josef Bacik <josef at toxicpanda.com>
Date:   Wed Oct 17 14:13:48 2012 -0400

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/btrfs-progs
    
    Forgot to pull before updating.
    
    Conflicts:
    	btrfs-progs.spec

 ...progs-correct-uninitialized-fsid-variable.patch |   55 ++++++++++++++++++++
 btrfs-progs.spec                                   |    4 ++
 2 files changed, 59 insertions(+), 0 deletions(-)
---
diff --cc btrfs-progs.spec
index 1c45615,756041a..d7ddc5d
--- a/btrfs-progs.spec
+++ b/btrfs-progs.spec
@@@ -68,9 -72,10 +68,13 @@@ rm -rf $RPM_BUILD_ROO
  %{_mandir}/man8/btrfs.8.gz
  
  %changelog
 +* Wed Oct 17 2012 Josef Bacik <josef at toxicpanda.com> 0.20.rc1.20121017git91d9eec-1
 +- update to latest btrfs-progs
 +
+ * Wed Oct 10 2012 Richard W.M. Jones <rjones at redhat.com> 0.19.20120817git043a639-2
+ - Add upstream patch to correct uninitialized fsid variable
+   (possible fix for RHBZ#863978).
+ 
  * Fri Aug 17 2012 Josef Bacik <josef at toxicpanda.com> 0.19.20120817git043a639-1
  - update to latest btrfs-progs