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

bugfix: fix display of volume usage on newly created volumes #3651

Merged
merged 1 commit into from
Jan 3, 2022

Conversation

gaudiauj
Copy link
Contributor

Component:

Volume overview

Context:

fix the following errors :
image (9)
image (10)

@gaudiauj gaudiauj self-assigned this Dec 30, 2021
@gaudiauj gaudiauj requested a review from a team as a code owner December 30, 2021 16:39
@bert-e
Copy link
Contributor

bert-e commented Dec 30, 2021

Hello gaudiauj,

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

Conflict

A conflict has been raised during the creation of
integration branch w/2.11/bugfix/volume-usage with contents from bugfix/volume-usage
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/bugfix/volume-usage origin/development/2.11
 $ git merge origin/bugfix/volume-usage
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/2.11/bugfix/volume-usage

Copy link
Contributor

@ChengYanJin ChengYanJin left a comment

Choose a reason for hiding this comment

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

Please address the conflicts within your PR as well, thanks!
You can follow the bert-e instructions just before this comment.

ui/src/services/utils.js Outdated Show resolved Hide resolved
ui/src/components/VolumeOverviewTab.js Outdated Show resolved Hide resolved
@gaudiauj gaudiauj force-pushed the bugfix/volume-usage branch 2 times, most recently from 1adb0bc to f0f1eba Compare December 31, 2021 10:10
@gaudiauj
Copy link
Contributor Author

/approve

@bert-e
Copy link
Contributor

bert-e commented Dec 31, 2021

Integration data created

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

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

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

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Dec 31, 2021

Build failed

The build for commit did not succeed in branch w/2.11/bugfix/volume-usage.

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Jan 3, 2022

Build failed

The build for commit did not succeed in branch w/123.0/bugfix/volume-usage.

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Jan 3, 2022

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

  • ✔️ development/123.0

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 Jan 3, 2022

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

  • ✔️ development/2.10

  • ✔️ development/2.11

  • ✔️ development/123.0

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

@bert-e bert-e merged commit b23fa45 into development/2.10 Jan 3, 2022
@bert-e bert-e deleted the bugfix/volume-usage branch January 3, 2022 20:15
TeddyAndrieux added a commit that referenced this pull request Jan 5, 2022
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.

None yet

3 participants