Skip to content
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.

Sign up for GitHub

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

Merge Freeze into Master #60074

Merged
merged 59 commits into from
Apr 27, 2021
Merged

Merge Freeze into Master #60074

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
fb48254
Merge 3002.6 bugfix changes (#59822)
dwoz Mar 18, 2021
c6776fb
Remove glance state module in favor of glance_image
Ch3LL Mar 12, 2021
65ee9df
update wording in changelog
Ch3LL Mar 17, 2021
9a4b379
bump deprecation warning to Silicon.
garethgreenaway Mar 16, 2021
274db7b
Updating warnutil version to Phosphorous.
garethgreenaway Mar 17, 2021
519049d
Update salt/modules/keystone.py
garethgreenaway Mar 19, 2021
484f8b6
Check $HOMEBREW_PREFIX when linking against libcrypto
hl-tam Feb 24, 2021
bf845a1
Add test case
krionbsd Mar 17, 2021
f1df562
Add changelog for 59808
Ch3LL Mar 17, 2021
6f7203b
Add changelog entry
hl-tam Mar 17, 2021
cdd5233
Make _find_libcrypto fail on Big Sur if it can't find a library
hl-tam Mar 17, 2021
9bf4912
Update _find_libcrypto tests
hl-tam Mar 17, 2021
0ef344e
Fix description of test_find_libcrypto_with_system_before_catalina
hl-tam Mar 19, 2021
b9c52e4
Patch sys.platform for test_rsax931 tests
Ch3LL Mar 22, 2021
ebcf77e
modules/match: add missing "minion_id" in Pillar example
eliasp Mar 14, 2021
0403439
Fix for issue #59773
dwoz Mar 16, 2021
1434716
Add changelog for #59773
dwoz Mar 17, 2021
de8db15
_get_initial_pillar function returns pillar
dwoz Mar 18, 2021
d778ee1
Fix linter issues
dwoz Mar 22, 2021
e5a792b
Clean up test
dwoz Mar 22, 2021
bececde
Bump deprecation release for neutron
Ch3LL Mar 23, 2021
d536fac
Uncomment Sulfur release name
Ch3LL Mar 23, 2021
56aabf2
Removing the _ext_nodes deprecation warning and alias.
garethgreenaway Mar 22, 2021
33c7a57
Adding changelog.
garethgreenaway Mar 22, 2021
c92a98f
Renaming changelog file.
garethgreenaway Mar 22, 2021
f34b7a1
Update 59804.removed
garethgreenaway Mar 23, 2021
a94e25f
Initial pass at fips_mode config option
dwoz Mar 23, 2021
605c654
Fix pre-commit
dwoz Mar 23, 2021
9fbb63f
Fix tests and add changelog
dwoz Mar 23, 2021
a586f9d
update docs 3003
frogunder Mar 23, 2021
982431e
update docs 3003 - newline
frogunder Mar 23, 2021
9242a14
Fix warts in changelog
dwoz Mar 23, 2021
6fa95b0
update releasenotes 3003
frogunder Apr 5, 2021
6c59577
add ubuntu-2004-amd64 m2crypto pycryptodome and tcp tests
Mar 24, 2021
1a9b7be
add distro_arch
Mar 22, 2021
15eb83f
changing the cloud platforms file missed in 1a9b7be0e2f300d87924731dc…
Apr 9, 2021
d7dd25f
Update __utils__ calls to import utils in azure
Ch3LL Apr 2, 2021
cc63ed7
Add changelog for 59744
Ch3LL Apr 5, 2021
98d6633
Fix azure unit tests and move to pytest
Ch3LL Apr 5, 2021
27b402a
Use contextvars from site-packages for thin
dwoz Apr 7, 2021
cd4c684
Add regression test for #59942
dwoz Apr 7, 2021
36340da
Add changelog for #59942
dwoz Apr 7, 2021
056772d
Update filemap to include test_py_versions
dwoz Apr 7, 2021
b44033f
Fix broken thin tests
dwoz Apr 7, 2021
dac44cd
Always install the `contextvars` backport, even on Py3.7+
s0undt3ch Apr 7, 2021
baad7a4
Use salt-factories to handle the container. Don't override default ro…
s0undt3ch Apr 7, 2021
c524792
Fix thin tests on windows
dwoz Apr 7, 2021
e612968
No need to use warn log level here
dwoz Apr 13, 2021
4013eeb
Fix getsitepackages for old virtualenv versions
dwoz Apr 14, 2021
07ca678
Add explicit pyobjc reqs
twangboy Apr 13, 2021
8ca21fb
Add back the passthrough stuff
twangboy Apr 16, 2021
fbc38c2
Remove a line so pre-commit will run
twangboy Apr 16, 2021
6383bd4
Bugfix release docs
ScriptAutomate Apr 20, 2021
20d72c0
Bugfix release docs
ScriptAutomate Apr 20, 2021
5e53460
Removing pip-compile log files
ScriptAutomate Apr 20, 2021
64774b4
Merge remote-tracking branch 'upstream/freeze' into merge_f_m
Ch3LL Apr 22, 2021
7c3f347
Fix failing test tests.unit.grains.test_core.CoreGrainsTestCase.test_…
Ch3LL Apr 22, 2021
5705c08
Fix pre-commit for docs.txt reqs
Ch3LL Apr 22, 2021
b491067
Merge branch 'master' into merge_f_m
garethgreenaway Apr 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions .pre-commit-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,65 +142,70 @@ repos:
- id: pip-tools-compile
alias: compile-pkg-darwin-3.5-zmq-requirements
name: Darwin Packaging Py3.5 ZeroMQ Requirements
files: ^(requirements/((base|zeromq|crypto|darwin)\.txt|static/pkg/(darwin\.in|py3\.5/darwin\.txt)))$
files: ^(requirements/((base|zeromq|crypto|darwin|pyobjc)\.txt|static/pkg/(darwin\.in|py3\.5/darwin\.txt)))$
pass_filenames: false
args:
- -v
- --py-version=3.5
- --platform=darwin
- --include=requirements/darwin.txt
- --include=requirements/pyobjc.txt
- --passthrough-line-from-input=^pyobjc(.*)$
- requirements/static/pkg/darwin.in

- id: pip-tools-compile
alias: compile-pkg-darwin-3.6-zmq-requirements
name: Darwin Packaging Py3.6 ZeroMQ Requirements
files: ^(requirements/((base|zeromq|crypto|darwin)\.txt|static/pkg/(darwin\.in|py3\.6/darwin\.txt)))$
files: ^(requirements/((base|zeromq|crypto|darwin|pyobjc)\.txt|static/pkg/(darwin\.in|py3\.6/darwin\.txt)))$
pass_filenames: false
args:
- -v
- --py-version=3.6
- --platform=darwin
- --include=requirements/darwin.txt
- --include=requirements/pyobjc.txt
- --passthrough-line-from-input=^pyobjc(.*)$
- requirements/static/pkg/darwin.in

- id: pip-tools-compile
alias: compile-pkg-darwin-3.7-zmq-requirements
name: Darwin Packaging Py3.7 ZeroMQ Requirements
files: ^(requirements/((base|zeromq|crypto|darwin)\.txt|static/pkg/(darwin\.in|py3\.7/darwin\.txt)))$
files: ^(requirements/((base|zeromq|crypto|darwin|pyobjc)\.txt|static/pkg/(darwin\.in|py3\.7/darwin\.txt)))$
pass_filenames: false
args:
- -v
- --py-version=3.7
- --platform=darwin
- --include=requirements/darwin.txt
- --include=requirements/pyobjc.txt
- --passthrough-line-from-input=^pyobjc(.*)$
- requirements/static/pkg/darwin.in

- id: pip-tools-compile
alias: compile-pkg-darwin-3.8-zmq-requirements
name: Darwin Packaging Py3.8 ZeroMQ Requirements
files: ^(requirements/((base|zeromq|crypto|darwin)\.txt|static/pkg/(darwin\.in|py3\.8/darwin\.txt)))$
files: ^(requirements/((base|zeromq|crypto|darwin|pyobjc)\.txt|static/pkg/(darwin\.in|py3\.8/darwin\.txt)))$
pass_filenames: false
args:
- -v
- --py-version=3.8
- --platform=darwin
- --include=requirements/darwin.txt
- --include=requirements/pyobjc.txt
- --passthrough-line-from-input=^pyobjc(.*)$
- requirements/static/pkg/darwin.in

- id: pip-tools-compile
alias: compile-pkg-darwin-3.9-zmq-requirements
name: Darwin Packaging Py3.9 ZeroMQ Requirements
files: ^(requirements/((base|zeromq|crypto|darwin)\.txt|static/pkg/(darwin\.in|py3\.9/darwin\.txt)))$
files: ^(requirements/((base|zeromq|crypto|darwin|pyobjc)\.txt|static/pkg/(darwin\.in|py3\.9/darwin\.txt)))$
pass_filenames: false
args:
- -v
- --py-version=3.9
- --platform=darwin
- --include=requirements/darwin.txt
- --include=requirements/pyobjc.txt
- --passthrough-line-from-input=^pyobjc(.*)$
- requirements/static/pkg/darwin.in

Expand Down
16 changes: 16 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,22 @@ Versions are `MAJOR.PATCH`.

# Changelog

Salt 3003.1 (2021-04-20)
========================

Removed
-------

- Removed support for Ubuntu 16.04 (#59913)


Fixed
-----

- Import salt.utils.azurearm instead of using __utils__ from loader in azure cloud. This fixes an issue where __utils__ would become unavailable when we are using the ThreadPool in azurearm. (#59744)
- Use contextvars libary from site-packages if it is intalled. Fixes salt ssh for targets with python <=3.6 (#59942)


Salt 3003 (2021-03-05)
======================

Expand Down
2 changes: 1 addition & 1 deletion doc/man/salt-api.1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
.TH "SALT-API" "1" "Feb 23, 2021" "3003" "Salt"
.TH "SALT-API" "1" "Apr 20, 2021" "3003.1" "Salt"
.SH NAME
salt-api \- salt-api Command
.
Expand Down
2 changes: 1 addition & 1 deletion doc/man/salt-call.1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
.TH "SALT-CALL" "1" "Feb 23, 2021" "3003" "Salt"
.TH "SALT-CALL" "1" "Apr 20, 2021" "3003.1" "Salt"
.SH NAME
salt-call \- salt-call Documentation
.
Expand Down
2 changes: 1 addition & 1 deletion doc/man/salt-cloud.1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
.TH "SALT-CLOUD" "1" "Feb 23, 2021" "3003" "Salt"
.TH "SALT-CLOUD" "1" "Apr 20, 2021" "3003.1" "Salt"
.SH NAME
salt-cloud \- Salt Cloud Command
.
Expand Down
2 changes: 1 addition & 1 deletion doc/man/salt-cp.1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
.TH "SALT-CP" "1" "Feb 23, 2021" "3003" "Salt"
.TH "SALT-CP" "1" "Apr 20, 2021" "3003.1" "Salt"
.SH NAME
salt-cp \- salt-cp Documentation
.
Expand Down
2 changes: 1 addition & 1 deletion doc/man/salt-key.1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
.TH "SALT-KEY" "1" "Feb 23, 2021" "3003" "Salt"
.TH "SALT-KEY" "1" "Apr 20, 2021" "3003.1" "Salt"
.SH NAME
salt-key \- salt-key Documentation
.
Expand Down
2 changes: 1 addition & 1 deletion doc/man/salt-master.1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
.TH "SALT-MASTER" "1" "Feb 23, 2021" "3003" "Salt"
.TH "SALT-MASTER" "1" "Apr 20, 2021" "3003.1" "Salt"
.SH NAME
salt-master \- salt-master Documentation
.
Expand Down
2 changes: 1 addition & 1 deletion doc/man/salt-minion.1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
.TH "SALT-MINION" "1" "Feb 23, 2021" "3003" "Salt"
.TH "SALT-MINION" "1" "Apr 20, 2021" "3003.1" "Salt"
.SH NAME
salt-minion \- salt-minion Documentation
.
Expand Down
2 changes: 1 addition & 1 deletion doc/man/salt-proxy.1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
.TH "SALT-PROXY" "1" "Feb 23, 2021" "3003" "Salt"
.TH "SALT-PROXY" "1" "Apr 20, 2021" "3003.1" "Salt"
.SH NAME
salt-proxy \- salt-proxy Documentation
.
Expand Down
2 changes: 1 addition & 1 deletion doc/man/salt-run.1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
.TH "SALT-RUN" "1" "Feb 23, 2021" "3003" "Salt"
.TH "SALT-RUN" "1" "Apr 20, 2021" "3003.1" "Salt"
.SH NAME
salt-run \- salt-run Documentation
.
Expand Down
2 changes: 1 addition & 1 deletion doc/man/salt-ssh.1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
.TH "SALT-SSH" "1" "Feb 23, 2021" "3003" "Salt"
.TH "SALT-SSH" "1" "Apr 20, 2021" "3003.1" "Salt"
.SH NAME
salt-ssh \- salt-ssh Documentation
.
Expand Down
2 changes: 1 addition & 1 deletion doc/man/salt-syndic.1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
.TH "SALT-SYNDIC" "1" "Feb 23, 2021" "3003" "Salt"
.TH "SALT-SYNDIC" "1" "Apr 20, 2021" "3003.1" "Salt"
.SH NAME
salt-syndic \- salt-syndic Documentation
.
Expand Down
2 changes: 1 addition & 1 deletion doc/man/salt-unity.1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
.TH "SALT-UNITY" "1" "Feb 23, 2021" "3003" "Salt"
.TH "SALT-UNITY" "1" "Apr 20, 2021" "3003.1" "Salt"
.SH NAME
salt-unity \- salt-unity Command
.
Expand Down
2 changes: 1 addition & 1 deletion doc/man/salt.1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
.TH "SALT" "1" "Feb 23, 2021" "3003" "Salt"
.TH "SALT" "1" "Apr 20, 2021" "3003.1" "Salt"
.SH NAME
salt \- salt
.
Expand Down
Loading