d84d08 Merge branch 'fix_keepalived_proxy' into 'production'

Merged and Committed by Theo Chatzimichos 6 years ago
    Merge branch 'fix_keepalived_proxy' into 'production'
    
    Fixes for proxies' keepalived
    
    See merge request infra/salt!109
        
file modified
+2 -2