emo/haproxy
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

Update HAProxy 2.6 to 2.6.5

Browse Source
This commit is contained in:
Tristan 2022-09-04 02:01:18 +01:00
parent 43bc1d577b
commit d5c60af0ba
No known key found for this signature in database
GPG Key ID: BDDFC4A0651ACDE4
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitlab-ci.yml
View File

@ -23,9 +23,9 @@ variables: &default-variables
.haproxy_stable: &haproxy-stable .haproxy_stable: &haproxy-stable
HAPROXY_GITREPO: "https://git.haproxy.org/?p=haproxy-2.6.git" HAPROXY_GITREPO: "https://git.haproxy.org/?p=haproxy-2.6.git"
HAPROXY_VERSION: 2.6.4 HAPROXY_VERSION: 2.6.5
# https://git.haproxy.org/?p=haproxy-2.6.git;a=commit;h=2a2078cbac2c2f84e0c25730b61f3ffbe891dd4d # https://git.haproxy.org/?p=haproxy-2.6.git;a=commit;h=987a4e248bbccf4bffe955b27ccfbcbb626348c2
HAPROXY_GITREF: 2a2078cbac2c2f84e0c25730b61f3ffbe891dd4d HAPROXY_GITREF: 987a4e248bbccf4bffe955b27ccfbcbb626348c2
.haproxy_dev: &haproxy-dev .haproxy_dev: &haproxy-dev
HAPROXY_GITREPO: "https://git.haproxy.org/?p=haproxy.git" HAPROXY_GITREPO: "https://git.haproxy.org/?p=haproxy.git"

4
haproxy/Makefile
View File

@ -1,6 +1,6 @@
HAPROXY_GITREPO = https://git.haproxy.org/?p=haproxy-2.6.git HAPROXY_GITREPO = https://git.haproxy.org/?p=haproxy-2.6.git
HAPROXY_VERSION = 2.6.4 HAPROXY_VERSION = 2.6.5
HAPROXY_GITREF = 2a2078cbac2c2f84e0c25730b61f3ffbe891dd4d HAPROXY_GITREF = 987a4e248bbccf4bffe955b27ccfbcbb626348c2
HAPROXY_SHORTSHA = $(shell echo "$(HAPROXY_GITREF)" | grep -Eo '^.{7}' || echo "$(HAPROXY_GITREF)") HAPROXY_SHORTSHA = $(shell echo "$(HAPROXY_GITREF)" | grep -Eo '^.{7}' || echo "$(HAPROXY_GITREF)")
HAPROXY_VERSION_MINOR = $(shell echo "$(HAPROXY_VERSION)" | cut -d'.' -f1-2) HAPROXY_VERSION_MINOR = $(shell echo "$(HAPROXY_VERSION)" | cut -d'.' -f1-2)