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

Bring #51372 to Master branch #55817

Merged
merged 5 commits into from Jan 23, 2020
Merged

Bring #51372 to Master branch #55817

merged 5 commits into from Jan 23, 2020

Conversation

twangboy
Copy link
Contributor

@twangboy twangboy commented Jan 8, 2020

What does this PR do?

Brings #51372 to master

Tests written?

Yes

Commits signed with GPG?

Yes

@twangboy twangboy requested a review from as a code owner Jan 8, 2020
@codecov
Copy link

@codecov codecov bot commented Jan 8, 2020

Codecov Report

Merging #55817 into master will increase coverage by 1.56%.
The diff coverage is 5.77%.

Impacted file tree graph

@@             Coverage Diff             @@
##           master   #55817       +/-   ##
===========================================
+ Coverage   18.77%   20.32%    +1.56%     
===========================================
  Files         827       37      -790     
  Lines      176462     7402   -169060     
  Branches    37977     1723    -36254     
===========================================
- Hits        33110     1504    -31606     
+ Misses     140702     5801   -134901     
+ Partials     2650       97     -2553
Flag Coverage Δ
#amazon1 18.72% <5.77%> (?)
#amazon2 20.16% <5.77%> (?)
#archlts 20.15% <5.77%> (+2.1%) ⬆️
#centos6 18.74% <5.77%> (?)
#centos7 20.2% <5.77%> (-3.56%) ⬇️
#centos8 18.62% <5.77%> (?)
#debian10 18.57% <5.77%> (?)
#debian8 18.72% <5.77%> (?)
#debian9 20.18% <5.77%> (?)
#fedora30 20.16% <5.77%> (?)
#fedora31 18.57% <5.77%> (?)
#m2crypto 20.22% <5.77%> (?)
#macosxmojave 20.15% <5.77%> (?)
#opensuse15 20.18% <5.77%> (?)
#proxy 20.22% <5.77%> (-3.59%) ⬇️
#py2 18.81% <5.77%> (+0.25%) ⬆️
#py3 18.77% <5.77%> (+0.38%) ⬆️
#pycryptodomex 20.22% <5.77%> (?)
#runtests 20.32% <5.77%> (+1.56%) ⬆️
#tcp 20.22% <5.77%> (?)
#tornado 18.72% <5.77%> (?)
#ubuntu1604 20.18% <5.77%> (-3.57%) ⬇️
#ubuntu1804 20.18% <5.77%> (?)
#zeromq 20.32% <5.77%> (+1.56%) ⬆️
Impacted Files Coverage Δ
salt/utils/win_network.py 5.2% <5.2%> (ø)
salt/utils/network.py 1.61% <50%> (-21.07%) ⬇️
salt/utils/yamlloader.py 28.13% <0%> (-36.45%) ⬇️
salt/utils/ctx.py 62.5% <0%> (-33.33%) ⬇️
salt/utils/context.py 32.31% <0%> (-32.3%) ⬇️
salt/utils/decorators/jinja.py 64.87% <0%> (-29.72%) ⬇️
salt/log/setup.py 17.32% <0%> (-29.71%) ⬇️
salt/utils/decorators/__init__.py 22.86% <0%> (-28.57%) ⬇️
salt/utils/args.py 13.34% <0%> (-25.99%) ⬇️
salt/config/__init__.py 1.52% <0%> (-25.93%) ⬇️
... and 811 more

1 similar comment
@codecov
Copy link

@codecov codecov bot commented Jan 8, 2020

Codecov Report

Merging #55817 into master will increase coverage by 1.56%.
The diff coverage is 5.77%.

Impacted file tree graph

@@             Coverage Diff             @@
##           master   #55817       +/-   ##
===========================================
+ Coverage   18.77%   20.32%    +1.56%     
===========================================
  Files         827       37      -790     
  Lines      176462     7402   -169060     
  Branches    37977     1723    -36254     
===========================================
- Hits        33110     1504    -31606     
+ Misses     140702     5801   -134901     
+ Partials     2650       97     -2553
Flag Coverage Δ
#amazon1 18.72% <5.77%> (?)
#amazon2 20.16% <5.77%> (?)
#archlts 20.15% <5.77%> (+2.1%) ⬆️
#centos6 18.74% <5.77%> (?)
#centos7 20.2% <5.77%> (-3.56%) ⬇️
#centos8 18.62% <5.77%> (?)
#debian10 18.57% <5.77%> (?)
#debian8 18.72% <5.77%> (?)
#debian9 20.18% <5.77%> (?)
#fedora30 20.16% <5.77%> (?)
#fedora31 18.57% <5.77%> (?)
#m2crypto 20.22% <5.77%> (?)
#macosxmojave 20.15% <5.77%> (?)
#opensuse15 20.18% <5.77%> (?)
#proxy 20.22% <5.77%> (-3.59%) ⬇️
#py2 18.81% <5.77%> (+0.25%) ⬆️
#py3 18.77% <5.77%> (+0.38%) ⬆️
#pycryptodomex 20.22% <5.77%> (?)
#runtests 20.32% <5.77%> (+1.56%) ⬆️
#tcp 20.22% <5.77%> (?)
#tornado 18.72% <5.77%> (?)
#ubuntu1604 20.18% <5.77%> (-3.57%) ⬇️
#ubuntu1804 20.18% <5.77%> (?)
#zeromq 20.32% <5.77%> (+1.56%) ⬆️
Impacted Files Coverage Δ
salt/utils/win_network.py 5.2% <5.2%> (ø)
salt/utils/network.py 1.61% <50%> (-21.07%) ⬇️
salt/utils/yamlloader.py 28.13% <0%> (-36.45%) ⬇️
salt/utils/ctx.py 62.5% <0%> (-33.33%) ⬇️
salt/utils/context.py 32.31% <0%> (-32.3%) ⬇️
salt/utils/decorators/jinja.py 64.87% <0%> (-29.72%) ⬇️
salt/log/setup.py 17.32% <0%> (-29.71%) ⬇️
salt/utils/decorators/__init__.py 22.86% <0%> (-28.57%) ⬇️
salt/utils/args.py 13.34% <0%> (-25.99%) ⬇️
salt/config/__init__.py 1.52% <0%> (-25.93%) ⬇️
... and 811 more

@ghost ghost requested a review from DmitryKuzmenko Jan 8, 2020
salt/utils/network.py Show resolved Hide resolved
salt/utils/win_network.py Outdated Show resolved Hide resolved
salt/utils/win_network.py Outdated Show resolved Hide resolved
salt/utils/win_network.py Outdated Show resolved Hide resolved
@twangboy twangboy added ZRELEASED - 2017.7 ZRELEASED - Neon and removed ZRELEASED - 2017.7 labels Jan 11, 2020
Copy link
Contributor

@rares-pop rares-pop left a comment

LGTM!

dwoz
dwoz approved these changes Jan 23, 2020
@dwoz dwoz merged commit fc674ed into saltstack:master Jan 23, 2020
50 checks passed
@twangboy twangboy deleted the win_network branch May 26, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ZRELEASED - Neon
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants