Skip to content
Snippets Groups Projects
Commit 85455921 authored by Aleš Mrázek's avatar Aleš Mrázek
Browse files

Merge branch 'release-5-5-1' into 'master'

release 5.5.1

See merge request !1308
parents aa6ae708 0d3457b1
Branches
Tags
2 merge requests!1327Update manager branch with the newest changes from master,!1308release 5.5.1
Pipeline #100908 failed with stages
in 1 hour, 48 minutes, and 58 seconds
......@@ -14,6 +14,7 @@ Ali Asad Lotia <ali.asad.lotia@gmail.com>
Anbang Wen <anbang@cloudflare.com>
Andreas Rammhold <andreas@rammhold.de>
Christophe Nowicki <cscm@csquad.org>
cronfy <cronfy@gmail.com>
Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Daniel Salzman <daniel.salzman@nic.cz>
daurnimator <quae@daurnimator.com>
......@@ -22,6 +23,7 @@ Grigorii Demidov <grigorii.demidov@nic.cz>
Hasnat <hasnat.ullah@gmail.com>
Héctor Molinero Fernández <hector@molinero.dev>
Ivana Krumlová <ivana.krumlova@nic.cz>
Jakub Jirutka <jakub@jirutka.cz>
Jakub Ružička <jakub.ruzicka@nic.cz>
Jan Hák <jan.hak@nic.cz>
Jan Holuša <jan.holusa@nic.cz>
......@@ -32,6 +34,7 @@ Jiří Helebrant <jiri.helebrant@nic.cz>
Jonathan Coetzee <jon@thancoetzee.com>
Josh Soref <jsoref@users.noreply.github.com>
Karel Slaný <karel.slany@nic.cz>
Konstantin Amelichev <kostya.amelichev@gmail.com>
Leo Vandewoestijne <github@unicycle.net>
Libor Peltan <libor.peltan@nic.cz>
Lukáš Ježek <lukas.jezek@nic.cz>
......@@ -66,7 +69,6 @@ Vladimír Čunát <vladimir.cunat@nic.cz>
Knot Resolver source tree also bundles code and content published by:
Austin Appleby <aappleby@gmail.com>
Dan Vanderkam <danvdk@gmail.com>
Jonas Gehring <jonas@jgehring.net>
Jonathan Allard <jonathan@allard.io>
Joseph A. Adams <joeyadams3.14159@gmail.com>
Mark DiMarco <mark.dimarco@gmail.com>
......
Knot Resolver 5.5.1 (2022-mm-dd)
Knot Resolver 5.5.1 (2022-06-14)
================================
Improvements
......
......@@ -37,7 +37,7 @@ RUN pip3 install pylint
RUN pip3 install pep8
RUN pip3 install pytest-xdist
# FIXME replace with dnspython >= 2.2.0 once released
RUN pip3 install git+git://github.com/bwelling/dnspython.git@72348d4698a8f8b209fbdf9e72738904ad31b930
RUN pip3 install git+https://github.com/bwelling/dnspython.git@72348d4698a8f8b209fbdf9e72738904ad31b930
# tests/pytest dependencies: skip over broken versions
RUN pip3 install jinja2 'pytest != 6.0.0' pytest-html pytest-xdist
# apkg for packaging
......
......@@ -34,7 +34,7 @@ RUN pip3 install pylint
RUN pip3 install pep8
RUN pip3 install pytest-xdist
# FIXME replace with dnspython >= 2.2.0 once released
RUN pip3 install git+git://github.com/bwelling/dnspython.git@72348d4698a8f8b209fbdf9e72738904ad31b930
RUN pip3 install git+https://github.com/bwelling/dnspython.git@72348d4698a8f8b209fbdf9e72738904ad31b930
# tests/pytest dependencies: skip over broken versions
RUN pip3 install jinja2 'pytest != 6.0.0' pytest-html pytest-xdist
# apkg for packaging
......
......@@ -4,7 +4,7 @@ project(
'knot-resolver',
['c', 'cpp'],
license: 'GPLv3+',
version: '5.5.0',
version: '5.5.1',
default_options: ['c_std=gnu11', 'b_ndebug=true'],
meson_version: '>=0.49',
)
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment