Merge pull request #18002 from BKPepe/haproxy-conflicts
authorJosef Schlehofer <pepe.schlehofer@gmail.com>
Mon, 14 Mar 2022 09:03:31 +0000 (10:03 +0100)
committerGitHub <noreply@github.com>
Mon, 14 Mar 2022 09:03:31 +0000 (10:03 +0100)
commit94fb0da32cd2ba5e107841a6b08c230b476ec40d
tree38dbfd040a35ae2760cf1cb8a88fa05700a932f3
parentc0d2c82528e19a304164dade96e9b019114b8fb0
parent487cc8fb264090f07a6d04f148b46a79f8950d8e
Merge pull request #18002 from BKPepe/haproxy-conflicts

haproxy: Makefile polishing and add conflict to SSL/non-SSL variant