e11916a Merge branch 'master' into f19

Merged and Committed by Josef Bacik 10 years ago
    Merge branch 'master' into f19
    
    Conflicts:
    	ceph.spec
    
        
file modified
+1 -0
file modified
+4 -4
file modified
+46 -19
file modified
+1 -1