3aba96
Merge branch 'c9s-sig-storage-ceph-quincy' of ssh://git.centos.org/rpms/ceph into c9s-sig-storage-ceph-quincy Conflicts: SPECS/ceph.spec