Skip to content

Gov cloud - Merge with main and Resolve conflicts#3400

Merged
LizaShak merged 4 commits into
feature/gov-cloudfrom
lishakur/resolve-conflicts2
Apr 2, 2023
Merged

Gov cloud - Merge with main and Resolve conflicts#3400
LizaShak merged 4 commits into
feature/gov-cloudfrom
lishakur/resolve-conflicts2

Conversation

@LizaShak

@LizaShak LizaShak commented Apr 2, 2023

Copy link
Copy Markdown
Collaborator

What is being addressed

Merge with main and Resolve conflicts

yuvalyaron and others added 2 commits March 30, 2023 14:49
* add upgrade button to resources that can be upgraded (non major upgrades only)

* update changelog

* update ui version

* fix cr review comments

* Update ui/app/src/components/shared/ConfirmUpgradeResource.tsx

Co-authored-by: James Griffin <me@JamesGriff.in>

---------

Co-authored-by: James Griffin <me@JamesGriff.in>
@LizaShak LizaShak requested a review from yuvalyaron April 2, 2023 07:24
@github-actions

github-actions Bot commented Apr 2, 2023

Copy link
Copy Markdown

Unit Test Results

0 tests   - 595   0 ✔️  - 595   0s ⏱️ -14s
0 suites  -     2   0 💤 ±    0 
0 files    -     2   0 ±    0 

Results for commit bdca0c3. ± Comparison against base commit 0dabf1e.

♻️ This comment has been updated with latest results.

@LizaShak LizaShak merged commit 83cc599 into feature/gov-cloud Apr 2, 2023
@LizaShak LizaShak deleted the lishakur/resolve-conflicts2 branch April 2, 2023 08:07
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.

2 participants