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

Jump to bottom

Here second conflicting PR #310

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Here second conflicting PR #310

wants to merge 6 commits into from

Conversation

AliakseiKhomchanka
Copy link
Collaborator

High-level description

What features does this change enable? What bugs does this change fix?

Corresponding DC/OS tickets (obligatory)

These DC/OS JIRA ticket(s) must be updated (ideally closed) in the moment this PR lands:

Related tickets (optional)

Other tickets related to this change:

Checklist for all PRs

  • Added a comprehensible changelog entry to CHANGES.md or explain why this is not a user-facing change:
  • Included a test which will fail if code is reverted but test is not. If there is no test please explain here:
  • Read the DC/OS contributing guidelines
  • Followed relevant code rules Rules for Packages and Systemd

Checklist for component/package updates:

If you are changing components or packages in DC/OS (e.g. you are bumping the sha or ref of anything underneath packages), then in addition to the above please also include:

  • Change log from the last version integrated (this should be a link to commits for easy verification and review): example
  • Test Results: [link to CI job test results for component]
  • Code Coverage (if available): [link to code coverage report]

PLEASE FILL IN THE TEMPLATE ABOVE / DO NOT REMOVE ANY SECTIONS ABOVE THIS LINE

Instructions and review process

What is the review process and when will my changes land?

All PRs require 2 approvals using GitHub's pull request reviews.

Reviewers should be:

  • Developers who understand the code being modified.
  • Developers responsible for code that interacts with or depends on the code being modified.

It is best to proactively ask for 2 reviews by @mentioning the candidate reviewers in the PR comments area. The responsibility is on the developer submitting the PR to follow-up with reviewers and make sure a PR is reviewed in a timely manner. Once a PR has 2 ship-it's, no red reviews, and all tests are green it will be included in the next train.

@d2iq-mergebot
Copy link
Owner

This repo has @mesosphere-mergebot integration. You can perform the following commands by submitting a comment. Submit a comment with content "@mesosphere-mergebot help" to view more detailed help text and examples. Be sure the have a look at the mergebot documentation, too.

@mesosphere-mergebot bump-ee  
@mesosphere-mergebot label [Awaiting Testing Approval|Work In Progress|Holding|merge-by-mergebot|Ready For Review|requested-changes|Ship It|Request For Comment] 
@mesosphere-mergebot override-status pr-status-check jira-url 
@mesosphere-mergebot sync  
@mesosphere-mergebot merge-it  
@mesosphere-mergebot changelog-not-required reason
  • PR creators can apply one of [Ready For Review|Work In Progress]. Owners can apply any label.

@d2iq-mergebot
Copy link
Owner

@mesosphere-mergebot bump-ee

@d2iq-mergebot
Copy link
Owner

Enterprise Bump PR: mesosphere/mergebot-test-dcos-enterprise/pull/203

@d2iq-mergebot
Copy link
Owner

@mesosphere-mergebot label work in progress

@d2iq-mergebot
Copy link
Owner

This PR (or its pair) encountered a conflict with the HEAD of the target branch.Please resolve the conflict, and apply ready for review label when the PR is ready.

d2iq-mergebot added a commit that referenced this pull request Jun 28, 2019
@d2iq-mergebot
Merge #310
8bbd27c
@d2iq-mergebot
Copy link
Owner

@mesosphere-mergebot label work in progress

@d2iq-mergebot
Copy link
Owner

This PR (or its pair) encountered a conflict with the HEAD of the target branch. Please resolve the conflict, and apply 'Ready For Review' label when the PR is ready.

d2iq-mergebot added a commit that referenced this pull request Jun 28, 2019
@d2iq-mergebot
Merge #310
0d7c661
@d2iq-mergebot
Copy link
Owner

@mesosphere-mergebot label work in progress

@d2iq-mergebot
Copy link
Owner

This PR (or its pair) encountered a conflict with the HEAD of the target branch. Please resolve the conflict, and apply 'Ready For Review' label when the PR is ready.

d2iq-mergebot added a commit that referenced this pull request Jun 28, 2019
@d2iq-mergebot
Merge #310
9fef782
@d2iq-mergebot
Copy link
Owner

@mesosphere-mergebot label work in progress

@d2iq-mergebot
Copy link
Owner

This PR (or its pair) encountered a conflict with the HEAD of the target branch. Please resolve the conflict, and apply 'Ready For Review' label when the PR is ready.

@d2iq-mergebot
Copy link
Owner

Backport PR for 1.12: #501
Backport PR for 1.13: #502

@d2iq-mergebot d2iq-mergebot mentioned this pull request Mar 17, 2020
Closed
@AliakseiKhomchanka
Copy link
Collaborator Author

@mesosphere-mergebot backport 1.12 1.13

This was referenced Mar 18, 2020
Closed
Closed
@d2iq-mergebot
Copy link
Owner

Backport PR for 1.12: #503
Backport PR for 1.13: #504

@AliakseiKhomchanka
Copy link
Collaborator Author

@mesosphere-mergebot backport 1.12 1.13

This was referenced Mar 18, 2020
Closed
Closed
@d2iq-mergebot
Copy link
Owner

Backport PR for 1.12: #505
Backport PR for 1.13: #506

@AliakseiKhomchanka
Copy link
Collaborator Author

@mesosphere-mergebot backport 1.12 1.13

@d2iq-mergebot d2iq-mergebot mentioned this pull request Mar 18, 2020
Closed
@d2iq-mergebot
Copy link
Owner

Backport PR for 1.12: #507
Backport PR for 1.13: #508

@d2iq-mergebot d2iq-mergebot mentioned this pull request Mar 18, 2020
Closed
@AliakseiKhomchanka
Copy link
Collaborator Author

@mesosphere-mergebot backport 1.12 1.13

@d2iq-mergebot d2iq-mergebot mentioned this pull request Mar 18, 2020
Closed
@d2iq-mergebot
Copy link
Owner

Backport PR for 1.12: #509
Backport PR for 1.13: #510

@d2iq-mergebot d2iq-mergebot mentioned this pull request Mar 18, 2020
Closed
@AliakseiKhomchanka
Copy link
Collaborator Author

@mesosphere-mergebot backport 1.12 1.13

This was referenced Mar 18, 2020
Closed
Closed
@d2iq-mergebot
Copy link
Owner

Backport PR for 1.12: #511
Backport PR for 1.13: #512

@AliakseiKhomchanka
Copy link
Collaborator Author

@mesosphere-mergebot backport 1.12 1.13

This was referenced Sep 2, 2020
Closed
Closed
@d2iq-mergebot
Copy link
Owner

Backport PR for 1.12: #742
Backport PR for 1.13: #744

@AliakseiKhomchanka
Copy link
Collaborator Author

@mesosphere-mergebot backport 1.12 1.13

This was referenced Sep 9, 2020
Closed
Closed
@d2iq-mergebot
Copy link
Owner

Backport PR for 1.12: #748
Backport PR for 1.13: #750

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
Work In Progress
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@AliakseiKhomchanka @d2iq-mergebot