92706a Merge branch 'tampakrap_proxy_keepalived' into 'production'

Merged and Committed by Theo Chatzimichos 6 years ago
    Merge branch 'tampakrap_proxy_keepalived' into 'production'
    
    fixes on keepalived.conf of the proxys based on lrupp's comments
    
    See merge request infra/salt!83
        
file modified
+2 -1