From 30442f28f80b9bdb8f2923f9be68732f0b76c78798755f53748c1851655dfde5 Mon Sep 17 00:00:00 2001 From: Robert Schweikert Date: Wed, 1 Mar 2023 15:24:49 +0000 Subject: [PATCH] cleanup merge message OBS-URL: https://build.opensuse.org/package/show/Cloud:Tools/cloud-init?expand=0&rev=204 --- cloud-init.changes | 1 - cloud-init.spec | 1 - 2 files changed, 2 deletions(-) diff --git a/cloud-init.changes b/cloud-init.changes index 7a24dae..ac3baa7 100644 --- a/cloud-init.changes +++ b/cloud-init.changes @@ -180,7 +180,6 @@ Tue Jan 31 19:47:23 UTC 2023 - Robert Schweikert + Prefer NetworkManager of sysconfig when available ------------------------------------------------------------------- ->>>>>>> ./cloud-init.changes.new Thu Dec 22 18:10:45 UTC 2022 - Robert Schweikert - Update to version 22.4 diff --git a/cloud-init.spec b/cloud-init.spec index daf5604..6c80b15 100644 --- a/cloud-init.spec +++ b/cloud-init.spec @@ -53,7 +53,6 @@ BuildRequires: python3-configobj >= 5.0.2 BuildRequires: python3-httpretty BuildRequires: python3-jsonpatch BuildRequires: python3-jsonschema -BuildRequires: python3-mock BuildRequires: python3-netifaces BuildRequires: python3-oauthlib BuildRequires: python3-pytest