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

build: Bump Kubernetes version to 1.21.6 #3583

Merged
merged 1 commit into from
Oct 28, 2021

Conversation

TeddyAndrieux
Copy link
Collaborator

No description provided.

@TeddyAndrieux TeddyAndrieux requested a review from a team October 28, 2021 05:46
@bert-e
Copy link
Contributor

bert-e commented Oct 28, 2021

Hello teddyandrieux,

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 28, 2021

Conflict

A conflict has been raised during the creation of
integration branch w/2.11/improvement/bump-k8s-1216 with contents from improvement/bump-k8s-1216
and development/2.11.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/2.11/improvement/bump-k8s-1216 origin/development/2.11
 $ git merge origin/improvement/bump-k8s-1216
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/2.11/improvement/bump-k8s-1216

@bert-e
Copy link
Contributor

bert-e commented Oct 28, 2021

History mismatch

Merge commit #112916ced177c9389358d0bc8aadeb0f35d58712 on the integration branch
w/2.11/improvement/bump-k8s-1216 is merging a branch which is neither the current
branch improvement/bump-k8s-1216 nor the development branch
development/2.11.

It is likely due to a rebase of the branch improvement/bump-k8s-1216 and the
merge is not possible until all related w/* branches are deleted or updated.

Please use the reset command to have me reinitialize these branches.

@bert-e
Copy link
Contributor

bert-e commented Oct 28, 2021

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:

@TeddyAndrieux
Copy link
Collaborator Author

/approve

@bert-e
Copy link
Contributor

bert-e commented Oct 28, 2021

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:

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Oct 28, 2021

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.10

  • ✔️ development/2.11

The following branches will NOT be impacted:

  • development/2.0
  • development/2.1
  • development/2.2
  • development/2.3
  • development/2.4
  • development/2.5
  • development/2.6
  • development/2.7
  • development/2.8
  • development/2.9

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 28, 2021

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

  • ✔️ development/2.10

  • ✔️ development/2.11

The following branches have NOT changed:

  • development/2.0
  • development/2.1
  • development/2.2
  • development/2.3
  • development/2.4
  • development/2.5
  • development/2.6
  • development/2.7
  • development/2.8
  • development/2.9

Please check the status of the associated issue None.

Goodbye teddyandrieux.

@bert-e bert-e merged commit 69b8974 into development/2.10 Oct 28, 2021
@bert-e bert-e deleted the improvement/bump-k8s-1216 branch October 28, 2021 09:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants