~ahasenack/ubuntu/+source/haproxy:jammy-haproxy-2414-merge

Branch merges

Propose for merging

Merged into ubuntu/+source/haproxy:debian/sid at revision ed24e8ddd6600488a34dc3326bc1841afd8763f6

Utkarsh Gupta (community): Approve on 2022-02-28

Canonical Server Core Reviewers: Pending requested 2022-02-28

Diff: 136 lines (+71/-3)

3 files modified

debian/changelog (+69/-0)
debian/control (+2/-2)
debian/rules (+0/-1)

api

Superseded for merging into ubuntu/+source/haproxy:ubuntu/devel

Canonical Server: Pending requested 2022-02-28

Canonical Server Core Reviewers: Pending requested 2022-02-28

Diff: 1115 lines (+309/-157) (has conflicts)

31 files modified

.github/matrix.py (+3/-0)
.github/workflows/compliance.yml (+1/-1)
.github/workflows/vtest.yml (+1/-1)
.github/workflows/windows.yml (+1/-1)
CHANGELOG (+28/-0)
SUBVERS (+1/-1)
VERDATE (+2/-2)
VERSION (+1/-1)
debian/changelog (+22/-0)
doc/configuration.txt (+1/-1)
include/haproxy/compiler.h (+25/-0)
include/haproxy/htx.h (+2/-2)
include/haproxy/mworker.h (+1/-0)
include/haproxy/server-t.h (+4/-4)
include/haproxy/sock-t.h (+0/-17)
include/haproxy/sock.h (+1/-2)
reg-tests/checks/40be_2srv_odd_health_checks.vtc (+91/-84)
scripts/build-ssl.sh (+11/-4)
src/fd.c (+7/-3)
src/haproxy.c (+5/-8)
src/mailers.c (+1/-1)
src/mux_h1.c (+1/-1)
src/mux_h2.c (+1/-1)
src/mworker.c (+30/-0)
src/proxy.c (+1/-1)
src/resolvers.c (+1/-3)
src/sink.c (+1/-1)
src/sock.c (+35/-1)
src/ssl_sock.c (+2/-2)
src/stream.c (+16/-12)
src/tools.c (+12/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related charm recipes

ed24e8d... by Andreas Hasenack on 2022-02-28

update-maintainer

9d512d8... by Andreas Hasenack on 2022-02-28

reconstruct-changelog

1c08085... by Andreas Hasenack on 2022-02-28

merge-changelogs

07b0ee5... by Andreas Hasenack on 2022-02-28

  * Dropped:
    - d/p/fix-ftbfs-openssl3.patch: Cherry-picked from upstream to fix
      the build against OpenSSL3 (LP #1945773)
      [Fixed upstream]

cc5fa1b... by Miriam España Acebal on 2021-12-09

    - d/{control,rules}: Removing support for OpenTracing due to it is
      in universe.

233891c... by Vincent Bernat on 2022-02-25

2.4.14-1 (patches unapplied)

Imported using git-ubuntu import.

3e21779... by Vincent Bernat on 2022-02-17

2.4.13-1 (patches unapplied)

Imported using git-ubuntu import.

d4e741c... by Vincent Bernat on 2022-01-11

2.4.12-1 (patches unapplied)

Imported using git-ubuntu import.

98cc44a... by Vincent Bernat on 2022-01-07

2.4.11-1 (patches unapplied)

Imported using git-ubuntu import.

07af004... by Vincent Bernat on 2021-12-23

2.4.10-1 (patches unapplied)

Imported using git-ubuntu import.