-
Notifications
You must be signed in to change notification settings - Fork 45
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
Bump containerd
to 1.2.14
#2874
Conversation
Retrieved from EPEL. See: https://download-ib01.fedoraproject.org/pub/epel/7/SRPMS/Packages/c/containerd-1.2.4-1.el7.src.rpm Cherry-picked from 516191b See: #2854
Hello gdemonet,My role is to assist you with the merge of this Status report is not available. |
ConflictA conflict has been raised during the creation of I have not created the integration branch. Here are the steps to resolve this conflict: $ git fetch
$ git checkout -B w/2.6/bugfix/2854-bump-containerd-1.2.14 origin/development/2.6
$ git merge origin/bugfix/2854-bump-containerd-1.2.14
$ # <intense conflict resolution>
$ git commit
$ git push -u origin w/2.6/bugfix/2854-bump-containerd-1.2.14 |
containerd
to 1.2.14
Not sure this should include the |
a60b873
to
0902dbc
Compare
Integration data createdI have created the integration data for the additional destination branches.
The following branches will NOT be impacted:
You can set option
|
Waiting for approvalThe following approvals are needed before I can proceed with the merge:
Peer approvals must include at least 1 approval from the following list:
|
/approve |
In the queueThe changeset has received all authorizations and has been added to the The changeset will be merged in:
The following branches will NOT be impacted:
There is no action required on your side. You will be notified here once IMPORTANT Please do not attempt to modify this pull request.
If you need this pull request to be removed from the queue, please contact a The following options are set: approve |
I have successfully merged the changeset of this pull request
The following branches have NOT changed:
Please check the status of the associated issue None. Goodbye gdemonet. |
Component: build
Context: #2854
Summary:
containerd
containerd
to 1.2.14Acceptance criteria:
Closes: #2854