3eea15 Merge branch 'cboltz-follow-lrupp' into 'production'

Merged and Committed by Christian Boltz 3 years ago
    Merge branch 'cboltz-follow-lrupp' into 'production'
    
    Wiki: give memcached more memory and security
    
    See merge request infra/salt!360