cf33aa Merge branch 'c8-sig-storage-gluster-8' of ssh://git.centos.org/rpms/glusterfs into c8-sig-storage-gluster-8

Merged and Committed by kkeithle 3 years ago
    Merge branch 'c8-sig-storage-gluster-8' of ssh://git.centos.org/rpms/glusterfs into c8-sig-storage-gluster-8
    
    Conflicts:
    	SPECS/glusterfs.spec
    
        
file modified
+7 -3