William Wernert 5cb8bd61b6 Merge remote-tracking branch 'origin/dev' into feature/auth ...

# Conflicts:
#	salt/common/nginx/nginx.conf.so-eval

2020-01-09 18:41:46 -05:00

..

nginx.conf.so-eval

Merge remote-tracking branch 'origin/dev' into feature/auth

2020-01-09 18:41:46 -05:00

nginx.conf.so-helix

Helix Logstash Changes

2019-12-10 10:02:41 -05:00

nginx.conf.so-master

remove cyberchef from proxy conf

2020-01-08 14:27:50 +00:00

nginx.conf.so-node

Fix several sytax errors

2018-08-08 10:02:43 -04:00

nginx.conf.so-sensor

fix filename and grep checks

2018-12-13 19:31:13 -05:00