43ee878 Merge branch 'master' of ssh://pkgs.fedoraproject.org/mesos

Merged and Committed by Timothy St. Clair 10 years ago
1 file changed. 5 lines added. 2 lines removed.
    Merge branch 'master' of ssh://pkgs.fedoraproject.org/mesos
    
    Conflicts:
    	mesos.spec
    
        
file modified
+5 -2