Skip to content

Commit 104cb32

Browse files
author
Landry JUGE
committed
Merge remote-tracking branch 'upstream/main' into service_offering_category_feature
# Conflicts: # ui/src/views/offering/AddComputeOffering.vue
2 parents 9eef3c5 + b744824 commit 104cb32

File tree

974 files changed

+32881
-7851
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

974 files changed

+32881
-7851
lines changed

‎.asf.yaml‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -50,16 +50,10 @@ github:
5050
rebase: false
5151

5252
collaborators:
53-
- acs-robot
5453
- gpordeus
55-
- hsato03
56-
- FelipeM525
57-
- lucas-a-martins
58-
- nicoschmdt
59-
- abh1sar
60-
- rosi-shapeblue
61-
- sudo87
6254
- erikbocks
55+
- Imvedansh
56+
- Damans227
6357

6458
protected_branches: ~
6559

‎.gitattributes‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
.github/workflows/*.lock.yml linguist-generated=true merge=ours

‎.github/CODEOWNERS‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,5 @@
2020

2121
.pre-commit-config.yaml @jbampton
2222
/.github/linters/ @jbampton
23+
24+
/plugins/network-elements/nsx/ @Pearl1594 @nvazquez

‎.github/aw/imports/.gitattributes‎

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.github/aw/imports/github/gh-aw/94662b1dee8ce96c876ba9f33b3ab8be32de82a4/.github_workflows_shared_reporting.md‎

Lines changed: 73 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,7 @@ jobs:
146146
smoke/test_vm_snapshot_kvm
147147
smoke/test_vm_snapshots
148148
smoke/test_volumes
149+
smoke/test_vpc_conserve_mode
149150
smoke/test_vpc_ipv6
150151
smoke/test_vpc_redundant
151152
smoke/test_vpc_router_nics

0 commit comments

Comments
 (0)