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

Bump containerd to 1.2.14 #2874

Merged
merged 4 commits into from
Oct 20, 2020
Merged

Conversation

gdemonet
Copy link
Contributor

Component: build

Context: #2854

Summary:

Acceptance criteria:


Closes: #2854

@gdemonet gdemonet added kind:bug Something isn't working topic:security Security-related issues topic:build Anything related to building steps complexity:easy Something that requires less than a day to fix priority:high High priority issues, should be worked on ASAP (after urgent issues), not postponed labels Oct 16, 2020
@gdemonet gdemonet requested a review from a team October 16, 2020 17:02
@bert-e
Copy link
Contributor

bert-e commented Oct 16, 2020

Hello gdemonet,

My role is to assist you with the merge of this
pull request. Please type @bert-e help to get information
on this process, or consult the user documentation.

Status report is not available.

@bert-e
Copy link
Contributor

bert-e commented Oct 16, 2020

Conflict

A conflict has been raised during the creation of
integration branch w/2.6/bugfix/2854-bump-containerd-1.2.14 with contents from bugfix/2854-bump-containerd-1.2.14
and development/2.6.

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

@gdemonet gdemonet changed the title Bugfix/2854 bump containerd 1.2.14 Bump containerd to 1.2.14 Oct 16, 2020
@NicolasT
Copy link
Contributor

Not sure this should include the seccomp commit to 2.5...

@gdemonet gdemonet force-pushed the bugfix/2854-bump-containerd-1.2.14 branch from a60b873 to 0902dbc Compare October 16, 2020 17:13
@bert-e
Copy link
Contributor

bert-e commented Oct 16, 2020

Integration data created

I have created the integration data for the additional destination branches.

The following branches will NOT be impacted:

  • development/1.0
  • development/1.1
  • development/1.2
  • development/1.3
  • development/2.0
  • development/2.1
  • development/2.2
  • development/2.3
  • development/2.4

You can set option create_pull_requests if you need me to create
integration pull requests in addition to integration branches, with:

@bert-e create_pull_requests

@bert-e
Copy link
Contributor

bert-e commented Oct 16, 2020

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • one peer

Peer approvals must include at least 1 approval from the following list:

@gdemonet gdemonet marked this pull request as ready for review October 19, 2020 08:06
@gdemonet
Copy link
Contributor Author

/approve

@bert-e
Copy link
Contributor

bert-e commented Oct 20, 2020

In the queue

The changeset has received all authorizations and has been added to the
relevant queue(s). The queue(s) will be merged in the target development
branch(es) as soon as builds have passed.

The changeset will be merged in:

  • ✔️ development/2.5

  • ✔️ development/2.6

  • ✔️ development/2.7

The following branches will NOT be impacted:

  • development/1.0
  • development/1.1
  • development/1.2
  • development/1.3
  • development/2.0
  • development/2.1
  • development/2.2
  • development/2.3
  • development/2.4

There is no action required on your side. You will be notified here once
the changeset has been merged. In the unlikely event that the changeset
fails permanently on the queue, a member of the admin team will
contact you to help resolve the matter.

IMPORTANT

Please do not attempt to modify this pull request.

  • Any commit you add on the source branch will trigger a new cycle after the
    current queue is merged.
  • Any commit you add on one of the integration branches will be lost.

If you need this pull request to be removed from the queue, please contact a
member of the admin team now.

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Oct 20, 2020

I have successfully merged the changeset of this pull request
into targetted development branches:

  • ✔️ development/2.5

  • ✔️ development/2.6

  • ✔️ development/2.7

The following branches have NOT changed:

  • development/1.0
  • development/1.1
  • development/1.2
  • development/1.3
  • development/2.0
  • development/2.1
  • development/2.2
  • development/2.3
  • development/2.4

Please check the status of the associated issue None.

Goodbye gdemonet.

@bert-e bert-e merged commit 0902dbc into development/2.5 Oct 20, 2020
@bert-e bert-e deleted the bugfix/2854-bump-containerd-1.2.14 branch October 20, 2020 20:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
complexity:easy Something that requires less than a day to fix kind:bug Something isn't working priority:high High priority issues, should be worked on ASAP (after urgent issues), not postponed topic:build Anything related to building steps topic:security Security-related issues
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants