Merge branch 'master' into feature/merge-2.3.51

# Conflicts:
#	VERSION
#	salt/influxdb/init.sls
This commit is contained in:
William Wernert
2021-05-21 12:31:54 -04:00
13 changed files with 45 additions and 229 deletions

View File

@@ -17,7 +17,6 @@
include:
- salt.minion
- salt.python3-influxdb
# Influx DB
influxconfdir:
file.directory:
@@ -139,4 +138,4 @@ so_downsample_cq:
test.fail_without_changes:
- name: {{sls}}_state_not_allowed
{% endif %}
{% endif %}