diff --git a/.gitignore b/.gitignore index 3e0dba8..33b2c38 100644 --- a/.gitignore +++ b/.gitignore @@ -74,3 +74,4 @@ /salt-2016.11.6.tar.gz /salt-2017.7.0.tar.gz /salt-2017.7.1.tar.gz +/salt-2017.7.2.tar.gz diff --git a/salt-minion b/salt-minion index fb9f044..377ca93 100644 --- a/salt-minion +++ b/salt-minion @@ -67,7 +67,7 @@ _su_cmd() { _get_pid() { - netstat $NS_NOTRIM -ap --protocol=unix 2>$ERROR_TO_DEVNULL \ + netstat -n $NS_NOTRIM -ap --protocol=unix 2>$ERROR_TO_DEVNULL \ | sed -r -e "\|\s${SOCK_DIR}/minion_event_${MINION_ID_HASH}_pub\.ipc$|"'!d; s|/.*||; s/.*\s//;' \ | uniq } @@ -155,7 +155,7 @@ start() { printf "\nPROCESSES:\n" >&2 ps wwwaxu | grep '[s]alt-minion' >&2 printf "\nSOCKETS:\n" >&2 - netstat $NS_NOTRIM -ap --protocol=unix | grep 'salt.*minion' >&2 + netstat -n $NS_NOTRIM -ap --protocol=unix | grep 'salt.*minion' >&2 printf "\nLOG_FILE:\n" >&2 tail -n 20 "$LOG_FILE" >&2 printf "\nENVIRONMENT:\n" >&2 @@ -176,7 +176,7 @@ stop() { echo "Service $SERVICE:$MINION_USER:$MINION_ID is not running" return 0 fi - + echo -n "Stopping $SERVICE:$MINION_USER:$MINION_ID daemon: " local pid="$(_get_pid)" diff --git a/salt.spec b/salt.spec index 5bd1cd2..a459e04 100644 --- a/salt.spec +++ b/salt.spec @@ -42,7 +42,7 @@ %define fish_dir %{_datadir}/fish/vendor_functions.d Name: salt -Version: 2017.7.1 +Version: 2017.7.2 Release: 1%{?dist} Summary: A parallel remote execution system @@ -627,6 +627,9 @@ rm -rf %{buildroot} %endif %changelog +* Mon Sep 18 2017 SaltStack Packaging Team - 2017.7.2-1 +- Update to feature release 2017.7.2 + * Tue Aug 15 2017 SaltStack Packaging Team - 2017.7.1-1 - Update to feature release 2017.7.1 - Altered dependency for dnf-utils instead of yum-utils if Fedora 26 or greater diff --git a/sources b/sources index ab42df1..0e86edf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (salt-2017.7.1.tar.gz) = c12db2361e04ce7bf4d663fafdeebdb318f210e0669d1ae26db6daf3dd19a7549b4151cb4e53acacda24d11eec7bbd06190b01cf4962d9027783ffd4617a2e52 +SHA512 (salt-2017.7.2.tar.gz) = 959cec404f0fa7c00f78427cba902b8b9c2c0d95016fc70925d8da6d0b97a0284fc034ac92a5c5c313763db4fdcbd1b0391318596b77fe8e0cd1c7e4b3fa928b