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

impr: BB-368 upgrade arsenal, bucketclient, prom-client & vaultclient #2372

Merged
merged 3 commits into from
Mar 16, 2023

Conversation

naren-rajendran
Copy link

No description provided.

@bert-e
Copy link
Contributor

bert-e commented Mar 15, 2023

Hello naren-rajendran,

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 Mar 15, 2023

Incorrect fix version

The Fix Version/s in issue BB-368 contains:

  • None

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

  • 7.10.9

  • 8.3.20

  • 8.4.26

  • 8.5.5

  • 8.6.6

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

@bert-e
Copy link
Contributor

bert-e commented Mar 15, 2023

Conflict

A conflict has been raised during the creation of
integration branch w/8.3/improvement/BB-368-upgrade-prom-client with contents from improvement/BB-368-upgrade-prom-client
and development/8.3.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/8.3/improvement/BB-368-upgrade-prom-client origin/development/8.3
 $ git merge origin/improvement/BB-368-upgrade-prom-client
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/8.3/improvement/BB-368-upgrade-prom-client

@naren-rajendran naren-rajendran removed the request for review from alexanderchan-scality March 16, 2023 01:31
@naren-rajendran naren-rajendran force-pushed the improvement/BB-368-upgrade-prom-client branch from f1a9691 to 315e7a2 Compare March 16, 2023 02:41
@naren-rajendran
Copy link
Author

@bert-e reset

@bert-e
Copy link
Contributor

bert-e commented Mar 16, 2023

Reset complete

I have successfully deleted this pull request's integration branches.

@bert-e
Copy link
Contributor

bert-e commented Mar 16, 2023

Conflict

A conflict has been raised during the creation of
integration branch w/8.3/improvement/BB-368-upgrade-prom-client with contents from improvement/BB-368-upgrade-prom-client
and development/8.3.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/8.3/improvement/BB-368-upgrade-prom-client origin/development/8.3
 $ git merge origin/improvement/BB-368-upgrade-prom-client
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/8.3/improvement/BB-368-upgrade-prom-client

@bert-e
Copy link
Contributor

bert-e commented Mar 16, 2023

Conflict

A conflict has been raised during the creation of
integration branch w/8.4/improvement/BB-368-upgrade-prom-client with contents from w/8.3/improvement/BB-368-upgrade-prom-client
and development/8.4.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/8.4/improvement/BB-368-upgrade-prom-client origin/development/8.4
 $ git merge origin/w/8.3/improvement/BB-368-upgrade-prom-client
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/8.4/improvement/BB-368-upgrade-prom-client

@bert-e
Copy link
Contributor

bert-e commented Mar 16, 2023

Conflict

A conflict has been raised during the creation of
integration branch w/8.5/improvement/BB-368-upgrade-prom-client with contents from w/8.4/improvement/BB-368-upgrade-prom-client
and development/8.5.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/8.5/improvement/BB-368-upgrade-prom-client origin/development/8.5
 $ git merge origin/w/8.4/improvement/BB-368-upgrade-prom-client
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/8.5/improvement/BB-368-upgrade-prom-client

@bert-e
Copy link
Contributor

bert-e commented Mar 16, 2023

Conflict

A conflict has been raised during the creation of
integration branch w/8.6/improvement/BB-368-upgrade-prom-client with contents from w/8.5/improvement/BB-368-upgrade-prom-client
and development/8.6.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/8.6/improvement/BB-368-upgrade-prom-client origin/development/8.6
 $ git merge origin/w/8.5/improvement/BB-368-upgrade-prom-client
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/8.6/improvement/BB-368-upgrade-prom-client

@bert-e
Copy link
Contributor

bert-e commented Mar 16, 2023

Waiting for approval

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

  • the author

  • 2 peers

@naren-rajendran
Copy link
Author

/approve

@bert-e
Copy link
Contributor

bert-e commented Mar 16, 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/7.10

  • ✔️ development/8.3

  • ✔️ development/8.4

  • ✔️ development/8.5

  • ✔️ development/8.6

The following branches will NOT be impacted:

  • development/7.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 Mar 16, 2023

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

  • ✔️ development/7.10

  • ✔️ development/8.3

  • ✔️ development/8.4

  • ✔️ development/8.5

  • ✔️ development/8.6

The following branches have NOT changed:

  • development/7.4

Please check the status of the associated issue BB-368.

Goodbye naren-rajendran.

@bert-e bert-e merged commit 4ada919 into development/7.10 Mar 16, 2023
@bert-e bert-e deleted the improvement/BB-368-upgrade-prom-client branch March 16, 2023 15:43
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.

6 participants