Skip to content

Merge develop into stable for release #1411

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 82 commits into from
Jan 21, 2020
Merged

Merge develop into stable for release #1411

merged 82 commits into from
Jan 21, 2020

Conversation

s0undt3ch
Copy link
Contributor

What does this PR do?

See title

kgbsd and others added 30 commits October 16, 2019 17:44
FreeBSD has py36-salt packages which handle all dependencies, etc - simple as pkg install -y py36-salt and then enabling it.  Don't need dependencies or git hacks.
Add 2019.11.04 sha and tornado warning
missed a freebsd_9_stable_deps part

Co-Authored-By: Denys Havrysh <Denys.Gavrysh@gmail.com>
move FreeBSD specifics to be under 'FreeBSD Install Functions'
remove old code that was left in there just for reference while debugging
_SALT_ETC_DIR=${BS_SALT_ETC_DIR:-/usr/local/etc/salt}
Says if variable is not set, set it to that.  By the time the script gets this far down, the variable is already set, so have to hardcode it to be /usr/local/etc/salt - part of the reason I had an 'if' statement around line 242, before the variable is set to default.
remove () in a call to shell function.

Co-Authored-By: Denys Havrysh <Denys.Gavrysh@gmail.com>
${salt_conf_file} no longer needed, this conf file for saltstack repo which is not used.
We now use symlinks that always point to latest
Actually default to Py2 like the docs say
Allow and actual version to be passed
Handle older versions
Write-Output when starting service
Use Latest instead of detecting latest
The latest and greatest version of ShellCheck seems to have more
hardened rules. This currently breaks CI tests in lint phase and
shows error messages for untouched lines in a PR.

It would be better to freeze the SC version and update it explicitly
with fixing all new founded issues.
Pin previous release of ShellCheck in CI tests
David Murphy and others added 27 commits December 12, 2019 15:15
Fix Amazon Linux 2 Python 3 support and other clean up
Updated Opensuse from 15.0 to 15.1 to get past Opensuse curl induced SIGSEGV
readme.rst, adds minimum Salt version for python3
Update version, ChangeLog and AUTHORS for stable merge
@bryceml bryceml merged commit 72aa457 into saltstack:stable Jan 21, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants