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.

Sign up for GitHub

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

Jump to bottom

ui/package: Bump the core-ui version to v0.22.2.1 #3629

Merged
merged 2 commits into from
Dec 7, 2021
Merged

ui/package: Bump the core-ui version to v0.22.2.1 #3629

merged 2 commits into from
Dec 7, 2021

Conversation

ChengYanJin
Copy link
Contributor

Component: UI

Context:
Bump the core-ui version to fix the broken tooltip in the charts.

Summary:
To fix the issue of the instance name with two dots cause no data in the
tooltip.

Acceptance criteria:

Closes: #ISSUE_NUMBER

@ChengYanJin
ui/package: Bump the core-ui version to v0.22.2.1
9ab0075 
To fix the issue of the instance name with two dots cause no data in the
tooltip.
@ChengYanJin ChengYanJin requested a review from a team as a code owner December 7, 2021 09:00
@bert-e
Copy link
Contributor

bert-e commented Dec 7, 2021

Hello chengyanjin,

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

Conflict

A conflict has been raised during the creation of
integration branch w/2.11/bugfix/bump-core-ui-version-to-v0.22.2.1 with contents from bugfix/bump-core-ui-version-to-v0.22.2.1
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/bump-core-ui-version-to-v0.22.2.1 origin/development/2.11
 $ git merge origin/bugfix/bump-core-ui-version-to-v0.22.2.1
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/2.11/bugfix/bump-core-ui-version-to-v0.22.2.1

@ChengYanJin
ui/nodes: Fix the bug where we don't have series for IOPS chart
694c2b5 
Introduce a technical debt because we add the isPlaneInterfaceRequired
prop in MetricSymmetricalChart, however we should useSymetricalChartSeries
hook when the median and quantile chart is ready.
@ChengYanJin
Copy link
Contributor Author

/status

@bert-e
Copy link
Contributor

bert-e commented Dec 7, 2021

Status

Status report is not available.

@bert-e
Copy link
Contributor

bert-e commented Dec 7, 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

@bert-e
Copy link
Contributor

bert-e commented Dec 7, 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:

@ChengYanJin
Copy link
Contributor Author

/reset

@bert-e
Copy link
Contributor

bert-e commented Dec 7, 2021

Reset complete

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

@bert-e
Copy link
Contributor

bert-e commented Dec 7, 2021

Conflict

A conflict has been raised during the creation of
integration branch w/2.11/bugfix/bump-core-ui-version-to-v0.22.2.1 with contents from bugfix/bump-core-ui-version-to-v0.22.2.1
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/bump-core-ui-version-to-v0.22.2.1 origin/development/2.11
 $ git merge origin/bugfix/bump-core-ui-version-to-v0.22.2.1
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/2.11/bugfix/bump-core-ui-version-to-v0.22.2.1

@ChengYanJin
Copy link
Contributor Author

/status

@bert-e
Copy link
Contributor

bert-e commented Dec 7, 2021

Status

Status report is not available.

@bert-e
Copy link
Contributor

bert-e commented Dec 7, 2021

History mismatch

Merge commit #c18cde9caa0eadd48088bf7a8083c250684ac916 on the integration branch
w/123.0/bugfix/bump-core-ui-version-to-v0.22.2.1 is merging a branch which is neither the current
branch bugfix/bump-core-ui-version-to-v0.22.2.1 nor the development branch
development/123.0.

It is likely due to a rebase of the branch bugfix/bump-core-ui-version-to-v0.22.2.1 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.

1 similar comment
@bert-e
Copy link
Contributor

bert-e commented Dec 7, 2021

History mismatch

Merge commit #c18cde9caa0eadd48088bf7a8083c250684ac916 on the integration branch
w/123.0/bugfix/bump-core-ui-version-to-v0.22.2.1 is merging a branch which is neither the current
branch bugfix/bump-core-ui-version-to-v0.22.2.1 nor the development branch
development/123.0.

It is likely due to a rebase of the branch bugfix/bump-core-ui-version-to-v0.22.2.1 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.

@ChengYanJin
Copy link
Contributor Author

/status

@bert-e
Copy link
Contributor

bert-e commented Dec 7, 2021

Status

Status report is not available.

@bert-e
Copy link
Contributor

bert-e commented Dec 7, 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:

@ChengYanJin
Copy link
Contributor Author

/approve

@bert-e
Copy link
Contributor

bert-e commented Dec 7, 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

  • ✔️ 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 Dec 7, 2021

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

@bert-e bert-e merged commit 694c2b5 into development/2.10 Dec 7, 2021
@bert-e bert-e deleted the bugfix/bump-core-ui-version-to-v0.22.2.1 branch December 7, 2021 17:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@JBWatenbergScality JBWatenbergScality JBWatenbergScality approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@ChengYanJin @bert-e @JBWatenbergScality