Skip to content

[WIP - DO NOT MERGE] Revert #55817#55981

Closed
Ch3LL wants to merge 3 commits intosaltstack:masterfrom
Ch3LL:revert_55817
Closed

[WIP - DO NOT MERGE] Revert #55817#55981
Ch3LL wants to merge 3 commits intosaltstack:masterfrom
Ch3LL:revert_55817

Conversation

@Ch3LL
Copy link
Copy Markdown
Contributor

@Ch3LL Ch3LL commented Jan 26, 2020

Revert #55817 to see if the tests run quicker on windows.

Ch3LL added 3 commits January 26, 2020 11:01
@Ch3LL
Revert "Bring saltstack#51372 to Master branch"
2abfc45 
This reverts commit a399d7f.

Conflicts:
  - salt/utils/network.py
  - salt/utils/win_network.py
  - tests/unit/utils/test_win_network.py
@Ch3LL
Revert "Fix some issues, standardize extraction, fix names"
bcf6ccf 
This reverts commit 513e783.

Conflicts:
salt/utils/network.py
salt/utils/win_network.py
@Ch3LL
Revert "Increase timeout for test_long_running_job test"
8a2417f 
This reverts commit 6bec22c.
@Ch3LL Ch3LL requested a review from a team as a code owner January 26, 2020 16:05
@ghost ghost requested a review from DmitryKuzmenko January 26, 2020 16:06
@Ch3LL Ch3LL closed this Jan 27, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@DmitryKuzmenko DmitryKuzmenko Awaiting requested review from DmitryKuzmenko

Assignees

@Ch3LL Ch3LL

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@Ch3LL