a0d115 sync with OpenStack Pike

Authored and Committed by mrunge 2 years ago
    sync with OpenStack Pike
    
        
file modified
+1 -0
file modified
+6 -11
file modified
+1 -1