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.

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

[2019.2] Merge forward from 2018.3 to 2019.2 #51586

Merged
merged 166 commits into from Feb 14, 2019

Conversation

@garethgreenaway
Copy link
Member

commented Feb 11, 2019

Merge branch '2018.3' into merge-2018.3

Conflicts:

  • doc/man/salt-api.1
  • doc/man/salt-call.1
  • doc/man/salt-cloud.1
  • doc/man/salt-cp.1
  • doc/man/salt-key.1
  • doc/man/salt-master.1
  • doc/man/salt-minion.1
  • doc/man/salt-proxy.1
  • doc/man/salt-run.1
  • doc/man/salt-ssh.1
  • doc/man/salt-syndic.1
  • doc/man/salt-unity.1
  • doc/man/salt.1
  • doc/man/salt.7
  • doc/man/spm.1
  • pkg/osx/build_env.sh
  • salt/utils/dns.py
  • tests/integration/netapi/rest_tornado/test_app.py
  • tests/support/case.py
  • tests/unit/utils/test_dns.py
ethframe and others added 30 commits Jan 21, 2019
file.check_perms raises CommandExecutionError with message that starts with
'Path not found' when file or directory was deleted between _depth_limited_walk
and actual permissions check. This error was correctly ignored for directories,
but not for files. This commit fixes error message check for files.
Adds tests for pillar and file roots validation
Warn about proper validation option
Fix 'Path not found' error in file.directory
…s, eg. windows systems.
Fix issue with case sensitivity
This is fixed via another PR (#51274)
Backport #51233 into 2018.3.4
Backport #51279 into 2018.3.4
Backport #51226 into 2018.3.45
Fixes #51249

The _multi_srvr recursively called since resolver in the function points
to _multi_srvr.
Looking at _host_ source code, split with two new lines is proper.

From https://ftp.isc.org/isc/bind9/9.13.5/bind-9.13.5.tar.gz

$ grep -A10 listed_server.*printed_server bin/dig/host.c
        if (listed_server && !printed_server) {
                char sockstr[ISC_SOCKADDR_FORMATSIZE];

                printf("Using domain server:\n");
                printf("Name: %s\n", query->userarg);
                isc_sockaddr_format(&query->sockaddr, sockstr,
                                    sizeof(sockstr));
                printf("Address: %s\n", sockstr);
                printf("Aliases: \n\n");
                printed_server = true;
        }
0.27.4 (released 5 days ago) removed pygit2.Reference.get_object()
Add 2017.7 codecov config
#50417 caused a regression in
which the env name is not properly detected as `base` when
`get_checkout_target()` returns the branch name corresponding to that
repo's `base` config option. This corrects that regression.
In these cases, if the commands are not auth'ed then the git LFS
subcommands don't know which identity file to use and will fall back to
the one from `~/.ssh/config`. By ensuring that the command is auth'ed,
the LFS subcommands are able to download files when needed.

Normally we don't need to auth to the remote repo for this, since we
have made sure that we already have the needed objects downloaded, and
that is why these commands were not auth'ed before.
frogunder and others added 17 commits Feb 6, 2019
…dle_mariadb_versions

[2018.3.4] Updating the mysql module to handle MariDB versions.
Convert data to string using salt util
Remove in progress from 2018.3.4 releasenotes
Fix ssh on Windows (2018.3.4)
Update url to libsodium for mac builds
Allow dynamic file_roots
 Conflicts:
	tests/integration/states/test_file.py
	tests/unit/states/test_file.py
	tests/unit/utils/test_dns.py
[2018.3] Merge forward from 2018.3.4 to 2018.3
 Conflicts:
	doc/man/salt-api.1
	doc/man/salt-call.1
	doc/man/salt-cloud.1
	doc/man/salt-cp.1
	doc/man/salt-key.1
	doc/man/salt-master.1
	doc/man/salt-minion.1
	doc/man/salt-proxy.1
	doc/man/salt-run.1
	doc/man/salt-ssh.1
	doc/man/salt-syndic.1
	doc/man/salt-unity.1
	doc/man/salt.1
	doc/man/salt.7
	doc/man/spm.1
	pkg/osx/build_env.sh
	salt/utils/dns.py
	tests/integration/netapi/rest_tornado/test_app.py
	tests/support/case.py
	tests/unit/utils/test_dns.py
@garethgreenaway garethgreenaway requested a review from saltstack/team-core as a code owner Feb 11, 2019
@codecov

This comment has been minimized.

Copy link

commented Feb 12, 2019

Codecov Report

Merging #51586 into 2019.2 will increase coverage by 31.73%.
The diff coverage is 35.2%.

Impacted file tree graph

@@             Coverage Diff             @@
##           2019.2   #51586       +/-   ##
===========================================
+ Coverage    0.56%    32.3%   +31.73%     
===========================================
  Files        1530     1469       -61     
  Lines      254245   241995    -12250     
  Branches    53840    51472     -2368     
===========================================
+ Hits         1439    78172    +76733     
+ Misses     252472   155183    -97289     
- Partials      334     8640     +8306
Flag Coverage Δ
#arch ?
#py3 32.3% <35.2%> (+31.73%) ⬆️
#transport 32.3% <35.2%> (?)
#ubuntu1604 32.3% <35.2%> (?)
Impacted Files Coverage Δ
salt/beacons/service.py 56.25% <ø> (+56.25%) ⬆️
salt/modules/git.py 16.06% <ø> (+16.06%) ⬆️
salt/states/file.py 37.54% <0%> (+37.54%) ⬆️
salt/utils/aws.py 14.9% <0%> (+14.9%) ⬆️
salt/modules/win_dsc.py 8.98% <0%> (+8.98%) ⬆️
salt/modules/ssh.py 19.19% <0%> (+19.19%) ⬆️
salt/payload.py 33.48% <0%> (+26.51%) ⬆️
salt/returners/elasticsearch_return.py 19.16% <0%> (+19.16%) ⬆️
salt/states/pkgrepo.py 7.69% <0%> (+7.69%) ⬆️
salt/modules/aptpkg.py 18.68% <0%> (+18.68%) ⬆️
... and 1415 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update e7ee04e...09fb3e7. Read the comment docs.

Copy link
Contributor

left a comment

Note that the failing jinja test is fixed by the very first commit in #51581, which is still pending merge. So, it can be disregarded.

dwoz and others added 3 commits Feb 13, 2019
@dwoz

This comment has been minimized.

Copy link
Contributor

commented Feb 14, 2019

@garethgreenaway

This comment has been minimized.

Copy link
Member Author

commented Feb 14, 2019

@dwoz will take a look.

@garethgreenaway garethgreenaway merged commit 705a62d into saltstack:2019.2 Feb 14, 2019
8 of 10 checks passed
8 of 10 checks passed
continuous-integration/jenkins/pr-merge This commit cannot be built
Details
jenkins/pr/py3-windows-2016 The py3-windows-2016 job has failed
Details
WIP Ready for review
Details
jenkins/pr/docs The docs job has passed
Details
jenkins/pr/lint Python lint test has passed
Details
jenkins/pr/py2-centos-7 The py2-centos-7 job has passed
Details
jenkins/pr/py2-ubuntu-1604 The py2-ubuntu-1604 job has passed
Details
jenkins/pr/py2-windows-2016 The py2-windows-2016 job has passed
Details
jenkins/pr/py3-centos-7 The py3-centos-7 job has passed
Details
jenkins/pr/py3-ubuntu-1604 The py3-ubuntu-1604 job has passed
Details
@garethgreenaway garethgreenaway deleted the garethgreenaway:merge-2018.3 branch Feb 22, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
You can’t perform that action at this time.