| commit | 2f82530873ff85b5f76151e565aebbf4c5d2fdcd | [log] [tgz] |
|---|---|---|
| author | Petr Michalec <epcim@apealive.net> | Sat Mar 17 15:09:56 2018 +0100 |
| committer | GitHub <noreply@github.com> | Sat Mar 17 15:09:56 2018 +0100 |
| tree | 0bbbc37454fc4f0d566b84b10fdad65b4b8ed976 | |
| parent | 6ba1c36caf7da4674981756457bad26d8cc2e080 [diff] | |
| parent | d2ba9377acd371f1710878ccbadd5f202e1cd975 [diff] |
Merge branch 'master' into develop
diff --git a/bootstrap.sh b/bootstrap.sh index 9a42838..39cd08a 100755 --- a/bootstrap.sh +++ b/bootstrap.sh
@@ -267,7 +267,6 @@ if ! grep '127.0.1.2.*salt' /etc/hosts; then echo "127.0.1.2 salt" | $SUDO tee -a /etc/hosts >/dev/null fi - } configure_salt_master()