55f5d07 Merge spec from el6-icehouse

Authored and Committed by hguemar 9 years ago
    Merge spec from el6-icehouse
    
        
file modified
+86 -13