990f87 Merge branch 'cboltz-wiki-memcached' into 'production'

Merged and Committed by Christian Boltz 4 years ago
    Merge branch 'cboltz-wiki-memcached' into 'production'
    
    Increase memcached memory usage for the wiki
    
    See merge request infra/salt!339