Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kubernetes1.22 for openSUSE:Factory checked in at 2021-12-25 20:16:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kubernetes1.22 (Old) and /work/SRC/openSUSE:Factory/.kubernetes1.22.new.2520 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kubernetes1.22" Sat Dec 25 20:16:38 2021 rev:4 rq:942336 version:1.22.4 Changes: -------- --- /work/SRC/openSUSE:Factory/kubernetes1.22/kubernetes1.22.changes 2021-12-16 21:19:50.538533341 +0100 +++ /work/SRC/openSUSE:Factory/.kubernetes1.22.new.2520/kubernetes1.22.changes 2021-12-25 20:16:56.197263814 +0100 @@ -1,0 +2,5 @@ +Fri Dec 17 10:02:26 UTC 2021 - Richard Brown <rbr...@suse.com> + +- Tidy up merge marker + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kubernetes1.22.spec ++++++ --- /var/tmp/diff_new_pack.7TkWpy/_old 2021-12-25 20:16:56.817264318 +0100 +++ /var/tmp/diff_new_pack.7TkWpy/_new 2021-12-25 20:16:56.829264328 +0100 @@ -68,14 +68,8 @@ It groups containers that make up an application into logical units for management and discovery. -<<<<<<< .mine - - -======= - ->>>>>>> .new - # packages to build containerized control plane + %package apiserver Summary: Kubernetes apiserver for container image Group: System/Management
