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

ZKUI-423 fix-data-browser-reload-on-token-renewal #700

Conversation

JBWatenbergScality
Copy link
Contributor

No description provided.

@bert-e
Copy link
Contributor

bert-e commented Dec 6, 2023

Hello jbwatenbergscality,

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 Dec 6, 2023

Incorrect fix version

The Fix Version/s in issue ZKUI-423 contains:

  • None

Considering where you are trying to merge, I ignored possible hotfix versions and I expected to find:

  • 2.1.8

  • 2.2.0

Please check the Fix Version/s of ZKUI-423, or the target
branch of this pull request.

@JBWatenbergScality
Copy link
Contributor Author

/approve

@bert-e
Copy link
Contributor

bert-e commented Dec 6, 2023

Incorrect fix version

The Fix Version/s in issue ZKUI-423 contains:

  • None

Considering where you are trying to merge, I ignored possible hotfix versions and I expected to find:

  • 2.1.8

  • 2.2.0

Please check the Fix Version/s of ZKUI-423, or the target
branch of this pull request.

The following options are set: approve

@JBWatenbergScality
Copy link
Contributor Author

/status

@bert-e
Copy link
Contributor

bert-e commented Dec 6, 2023

Status

Status report is not available.

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Dec 6, 2023

Conflict

A conflict has been raised during the creation of
integration branch w/2.2/bugfix/ZKUI-423-fix-data-borwser-reload-on-token-renewal with contents from bugfix/ZKUI-423-fix-data-borwser-reload-on-token-renewal
and development/2.2.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/2.2/bugfix/ZKUI-423-fix-data-borwser-reload-on-token-renewal origin/development/2.2
 $ git merge origin/bugfix/ZKUI-423-fix-data-borwser-reload-on-token-renewal
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/2.2/bugfix/ZKUI-423-fix-data-borwser-reload-on-token-renewal

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Dec 6, 2023

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

@scality scality deleted a comment from bert-e Dec 7, 2023
@scality scality deleted a comment from hervedombya Dec 7, 2023
@bert-e
Copy link
Contributor

bert-e commented Dec 7, 2023

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

@scality scality deleted a comment from bert-e Dec 7, 2023
Copy link
Contributor

@hervedombya hervedombya left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 👍

@bert-e
Copy link
Contributor

bert-e commented Dec 7, 2023

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

  • ✔️ development/2.2

The following branches will NOT be impacted:

  • development/1.4
  • development/1.5
  • development/1.6
  • development/2.0

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 Dec 7, 2023

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

  • ✔️ development/2.1

  • ✔️ development/2.2

The following branches have NOT changed:

  • development/1.4
  • development/1.5
  • development/1.6
  • development/2.0

Please check the status of the associated issue ZKUI-423.

Goodbye jbwatenbergscality.

@bert-e bert-e merged commit aa094ed into development/2.1 Dec 7, 2023
15 checks passed
@bert-e bert-e deleted the bugfix/ZKUI-423-fix-data-borwser-reload-on-token-renewal branch December 7, 2023 14:25
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