2692468 Merge remote-tracking branch 'origin/master' into el5

Merged and Committed by kkeithle 10 years ago
    Merge remote-tracking branch 'origin/master' into el5
    
    glusterfs-3.4.0-8, glusterfs-server requires glusterfs-cli
    
        
file modified
+5 -1