Skip to content

Commit f2cf82e

Browse files
committed
Merge branch 'main' into 2.0
2 parents 59ce246 + 6b8eb01 commit f2cf82e

272 files changed

Lines changed: 9238 additions & 2320 deletions

File tree

Some content is hidden

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

.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,4 +95,4 @@
9595
/toolkit/scripts/toolchain/create_toolchain_in_container.sh @microsoft/cbl-mariner-admins
9696

9797
# Modifications to the trusted CA certificates require admin approval.
98-
/SPECS/*ca-certificates*/*
98+
/SPECS/*ca-certificates*/* @microsoft/cbl-mariner-admins

.github/workflows/validate-cg-manifest.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ ignore_multiple_sources=" \
2323

2424
# List of ignored specs due to no source tarball to scan.
2525
ignore_no_source_tarball=" \
26+
azurelinux-sysinfo \
2627
ca-certificates \
2728
check-restart \
2829
core-packages \
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
busybox
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
containerized-data-importer-api
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
containerized-data-importer-cloner
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
containerized-data-importer-controller
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
containerized-data-importer-importer
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
containerized-data-importer-operator
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
containerized-data-importer-uploadproxy
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
containerized-data-importer-uploadserver

0 commit comments

Comments
 (0)