Merge branch 'master' of ssh://pkgs.fedoraproject.org/rpms/container-selinux

.gitignore

@@ -78,4 +78,10 @@
 /container-selinux-eb60838.tar.gz
 /container-selinux-92af7fd.tar.gz
 /container-selinux-c178849.tar.gz
+<<<<<<< HEAD
+=======
+/container-selinux-891a85f.tar.gz
+/container-selinux-2c1a2ab.tar.gz
+/container-selinux-5c98b56.tar.gz
+>>>>>>> 8285069315e740de348964c83cfa49bb2586975f
 /container-selinux-2521d0d.tar.gz

container-selinux.spec

@@ -27,7 +27,11 @@ Name: container-selinux
 Epoch: 2
 %endif
 Version: 2.89
+<<<<<<< HEAD
 Release: 1.git%{shortcommit0}%{?dist}
+=======
+Release: 5.git%{shortcommit0}%{?dist}
+>>>>>>> 8285069315e740de348964c83cfa49bb2586975f
 License: GPLv2
 URL: %{git0}
 Summary: SELinux policies for container runtimes
@@ -109,10 +113,27 @@ fi
 %{_datadir}/selinux/*
 
 %changelog
+<<<<<<< HEAD
 * Sat Mar 9 2019 Dan Walsh <dwalsh@fedoraproject.org> - 2.89-1
 - Allow all container domains to have container file types entrypoint
 - Add new release to fix issues with udica
 - Allow container_runtime_t to dyntransition to container domains
+=======
+* Sat Mar 09 2019 Lokesh Mandvekar (Bot) <lsm5+bot@fedoraproject.org> - 2:2.89-5.git2521d0d
+- bump to 2.89
+- autobuilt 2521d0d
+
+* Thu Mar 07 2019 Lokesh Mandvekar (Bot) <lsm5+bot@fedoraproject.org> - 2:2.88-4.git5c98b56
+- bump to 2.88
+- autobuilt 5c98b56
+
+* Wed Mar 06 2019 Lokesh Mandvekar (Bot) <lsm5+bot@fedoraproject.org> - 2:2.87-3.git2c1a2ab
+- autobuilt 2c1a2ab
+
+* Sat Mar 02 2019 Lokesh Mandvekar (Bot) <lsm5+bot@fedoraproject.org> - 2:2.87-2.git891a85f
+- bump to 2.87
+- autobuilt 891a85f
+>>>>>>> 8285069315e740de348964c83cfa49bb2586975f
 
 * Fri Mar 1 2019 Dan Walsh <dwalsh@fedoraproject.org> - 2.86-1
 - Allow unconfined user and services to dyntrans to container domains, needed for CRIU