pool/kubernetes1.22
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Tidy up merge marker

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/devel:kubic/kubernetes1.22?expand=0&rev=10
This commit is contained in:
Richard Brown 2021-12-17 10:03:20 +00:00 committed by Git OBS Bridge
parent 58a3068932
commit cf62f89c5e
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
kubernetes1.22.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Dec 17 10:02:26 UTC 2021 - Richard Brown <rbrown@suse.com>
- Tidy up merge marker
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Dec 08 15:23:39 UTC 2021 - rbrown@suse.com Wed Dec 08 15:23:39 UTC 2021 - rbrown@suse.com

8
kubernetes1.22.spec
View File

@ -68,14 +68,8 @@ management of containerized applications.
It groups containers that make up an application into logical units It groups containers that make up an application into logical units
for management and discovery. for management and discovery.
<<<<<<< .mine
=======
>>>>>>> .new
# packages to build containerized control plane # packages to build containerized control plane
%package apiserver %package apiserver
Summary: Kubernetes apiserver for container image Summary: Kubernetes apiserver for container image
Group: System/Management Group: System/Management