aljaz/kata-containers
1
0
Fork 0
mirror of https://github.com/aljazceru/kata-containers.git synced 2026-01-08 08:54:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

CCv0: Merge main into CCv0 branch

Browse Source 
Merge remote-tracking branch 'upstream/main' into CCv0

Fixes: #5824
Signed-off-by: stevenhorsman <steven@uk.ibm.com>
This commit is contained in:
stevenhorsman
2022-12-02 16:15:39 +00:00
parent d910a79a3f 8246de821f
commit 578ee62da2
105 changed files with 4977 additions and 562 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/runtime/cmd/containerd-shim-kata-v2/main.go
View File

@@ -24,7 +24,7 @@ func shimConfig(config *shimapi.Config) {
func main() {
if len(os.Args) == 2 && os.Args[1] == "--version" {
fmt.Printf("%s containerd shim: id: %q, version: %s, commit: %v\n", katautils.PROJECT, types.DefaultKataRuntimeName, katautils.VERSION, katautils.COMMIT)
fmt.Printf("%s containerd shim (Golang): id: %q, version: %s, commit: %v\n", katautils.PROJECT, types.DefaultKataRuntimeName, katautils.VERSION, katautils.COMMIT)
os.Exit(0)
}

1
src/runtime/cmd/kata-runtime/kata-check_generic_test.go
View File

@@ -4,7 +4,6 @@
//
//go:build arm64 || ppc64le
// +build arm64 ppc64le
package main

1
src/runtime/cmd/kata-runtime/kata-env_generic_test.go
View File

@@ -4,7 +4,6 @@
//
//go:build arm64 || ppc64le
// +build arm64 ppc64le
package main