Merge branch 'dev' into kilo

# Conflicts:
#	setup/so-functions
This commit is contained in:
William Wernert
2021-02-24 17:05:53 -05:00

View File

@@ -2301,7 +2301,7 @@ set_default_log_size() {
if [ -d /nsm/elasticsearch ]; then
disk_dir="/nsm/elasticsearch"
fi
local disk_size_1k
disk_size_1k=$(df $disk_dir | grep -v "^Filesystem" | awk '{print $2}')