rpms/containers-common
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to grab latest man pages and configuration files, also switch to using some main rather then master branches

Browse Source
This commit is contained in:
Daniel J Walsh 2021-06-10 08:54:54 -04:00
parent d09b5a13b3
commit a2e5a85918
No known key found for this signature in database
GPG Key ID: A2DF901DABE2C028
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
containers-common.spec
View File

@ -5,7 +5,7 @@
# Buildah/Podman/Skopeo. # Buildah/Podman/Skopeo.
%global skopeo_branch master %global skopeo_branch master
%global podman_branch master %global podman_branch master
%global image_branch master %global image_branch main
%global common_branch main %global common_branch main
%global storage_branch main %global storage_branch main
%global shortnames_branch main %global shortnames_branch main
@ -136,13 +136,11 @@ ln -s %{_sysconfdir}/yum.repos.d/redhat.repo %{buildroot}%{_datadir}/rhel/secret
%{_datadir}/rhel/secrets/* %{_datadir}/rhel/secrets/*
%changelog %changelog
<<<<<<< HEAD
* Thu Jun 10 2021 Dan Walsh <dwalsh@fedoraproject.org> - 4:1-19 * Thu Jun 10 2021 Dan Walsh <dwalsh@fedoraproject.org> - 4:1-19
- Update to grab latest man pages and configuration files, also switch to using some main rather then master branches - Update to grab latest man pages and configuration files, also switch to using some main rather then master branches
=======
* Tue May 18 2021 Lokesh Mandvekar <lsm5@fedoraproject.org> - 4:1-19 * Tue May 18 2021 Lokesh Mandvekar <lsm5@fedoraproject.org> - 4:1-19
- use container-selinux 2.162.1 and use latest configs - use container-selinux 2.162.1 and use latest configs
>>>>>>> 0f389750defb05318144c76645808719db79b246
* Tue May 11 2021 Dan Walsh <dwalsh@fedoraproject.org> - 4:1-18 * Tue May 11 2021 Dan Walsh <dwalsh@fedoraproject.org> - 4:1-18
- Update containers.conf to latest, and change default log-driver to journald. - Update containers.conf to latest, and change default log-driver to journald.