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.1 with multimaster bb fixes #54247

Merged

Conversation

@DmitryKuzmenko
Copy link
Contributor

commented Aug 18, 2019

What does this PR do?

Cherry-pick of #54239 into 2019.2.1 branch.

DmitryKuzmenko added 18 commits Jun 3, 2019
@DmitryKuzmenko DmitryKuzmenko requested a review from saltstack/team-core as a code owner Aug 18, 2019
@pull-assigner pull-assigner bot requested a review from garethgreenaway Aug 18, 2019
@DmitryKuzmenko DmitryKuzmenko requested review from waynew, dwoz and s0undt3ch Aug 19, 2019
This change is not related to any tets failures and current CI
configuration at all.
@waynew
waynew approved these changes Aug 20, 2019
@dwoz dwoz added the WarRoom label Aug 21, 2019
@dwoz
dwoz approved these changes Aug 21, 2019
@Akm0d
Akm0d approved these changes Aug 21, 2019
@DmitryKuzmenko DmitryKuzmenko changed the base branch from 2019.2.1 to 2019.2 Aug 22, 2019
@DmitryKuzmenko DmitryKuzmenko changed the base branch from 2019.2 to 2019.2.1 Aug 22, 2019
@DmitryKuzmenko

This comment has been minimized.

Copy link
Contributor Author

commented Aug 22, 2019

This got stuck for some reason after I've merged 2019.2.1 in command-line resolved conflicts. So I've tried to change the base branch and change it back. Now it looks okay. Let's wait for CI results.

@DmitryKuzmenko

This comment has been minimized.

Copy link
Contributor Author

commented Aug 22, 2019

re-run full all

dwoz and others added 2 commits Aug 22, 2019
@DmitryKuzmenko

This comment has been minimized.

Copy link
Contributor Author

commented Aug 23, 2019

The only alive failure is an unrelated known issue.
#53931

@dwoz dwoz merged commit 531f3aa into saltstack:2019.2.1 Aug 23, 2019
23 of 24 checks passed
23 of 24 checks passed
ci/py2/windows2016 This commit cannot be built
Details
WIP Ready for review
Details
ci/docs This commit looks good
Details
ci/lint This commit looks good
Details
ci/py2/amazon2 This commit looks good
Details
ci/py2/centos6 This commit looks good
Details
ci/py2/centos7 This commit looks good
Details
ci/py2/centos7/tcp This commit looks good
Details
ci/py2/debian8 This commit looks good
Details
ci/py2/debian9 This commit looks good
Details
ci/py2/fedora29 This commit looks good
Details
ci/py2/ubuntu1604 This commit looks good
Details
ci/py2/ubuntu1604/tcp This commit looks good
Details
ci/py2/ubuntu1804 This commit looks good
Details
ci/py3/amazon2 This commit looks good
Details
ci/py3/centos7 This commit looks good
Details
ci/py3/centos7/tcp This commit looks good
Details
ci/py3/debian8 This commit looks good
Details
ci/py3/debian9 This commit looks good
Details
ci/py3/fedora29 This commit looks good
Details
ci/py3/ubuntu1604 This commit looks good
Details
ci/py3/ubuntu1604/tcp This commit looks good
Details
ci/py3/ubuntu1804 This commit looks good
Details
ci/py3/windows2016 This commit looks good
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
5 participants
You can’t perform that action at this time.