080c7d Merge branch 'revert-f2885fe3' into 'production'

Merged and Committed by Theo Chatzimichos 6 years ago
    Merge branch 'revert-f2885fe3' into 'production'
    
    Revert "Merge branch 'cboltz-elasticsearch-workaround' into 'production'"
    
    See merge request infra/salt!116
        
file modified
+1 -3
file modified
+0 -3