7ed9a09 sync for OpenStack pike

Authored and Committed by mrunge 6 years ago
    sync for OpenStack pike
    
        
file modified
+1 -0
file modified
+12 -28
file modified
+1 -1