Accepting request 682743 from devel:kubic

- podman-cni-config: remove artificial conflicts with kubelet (forwarded request 682742 from RBrownSUSE)

OBS-URL: https://build.opensuse.org/request/show/682743
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/podman?expand=0&rev=39
This commit is contained in:
2019-03-08 11:00:51 +00:00
committed by Git OBS Bridge
parent 31ce80db64
commit aa618aaf5a
8 changed files with 134 additions and 142 deletions

View File

@@ -4,8 +4,8 @@
<param name="url">https://github.com/containers/libpod.git</param>
<param name="scm">git</param>
<param name="filename">podman</param>
<param name="versionformat">1.0.1</param>
<param name="revision">v1.0.1</param>
<param name="versionformat">1.1.2</param>
<param name="revision">v1.1.2</param>
</service>
<service name="set_version" mode="disabled">
@@ -16,8 +16,8 @@
<param name="url">https://github.com/kubernetes-sigs/cri-o.git</param>
<param name="scm">git</param>
<param name="filename">conmon</param>
<param name="versionformat">1.13.0</param>
<param name="revision">825baaafb651a3b01fbc01c0bc9be945196a3ee5</param>
<param name="versionformat">1.13.1</param>
<param name="revision">v1.13.1</param>
</service>
<service name="recompress" mode="disabled">