Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] master from AdguardTeam:master #105

Merged
merged 4 commits into from
Dec 2, 2023

Conversation

pull[bot]
Copy link

@pull pull bot commented Nov 29, 2023

See Commits and Changes for more details.


Created by pull[bot]

Can you help keep this open source service alive? 💖 Please sponsor : )

Squashed commit of the following:

commit 5a9e8c0
Merge: 85820c1 c4e69cd
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Tue Nov 28 16:09:53 2023 +0300

    Merge branch 'master' into AG-27539-imp-upstream-test

commit 85820c1
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Tue Nov 28 15:48:53 2023 +0300

    dnsforward: split code

commit dac0148
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Fri Nov 24 15:47:05 2023 +0300

    dnsforward: fix docs

commit 9f0015b
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Fri Nov 24 14:45:43 2023 +0300

    dnsforward: imp code

commit 49fefc3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Thu Nov 23 14:12:02 2023 +0300

    dnsforward: imp code

commit 120ba4b
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Wed Nov 22 17:02:01 2023 +0300

    dnsforward: add tests

commit 7077597
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Wed Nov 22 15:48:05 2023 +0300

    dnsforward: imp code

commit 9487f1f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Tue Nov 21 18:06:00 2023 +0300

    dnsforward: imp code

commit e2612e0
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Tue Nov 21 16:12:20 2023 +0300

    dnsforward: add ups checker

commit 09db7d2
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Tue Nov 14 17:31:04 2023 +0300

    dnsforward: separate upstream code
@pull pull bot added the ⤵️ pull label Nov 29, 2023
EugeneOne1 and others added 3 commits November 29, 2023 15:37
Updates #6457.

Squashed commit of the following:

commit c51cb5f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Wed Nov 29 15:20:10 2023 +0300

    dnsforward: fix bootstrap usage
Updates #6420.

Squashed commit of the following:

commit 84a2a45
Merge: a578fc2 0e4e243
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Thu Nov 30 16:42:48 2023 +0300

    Merge branch 'master' into 6420-ipset-header-data-query

commit a578fc2
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Thu Nov 30 15:52:42 2023 +0300

    ipset: imp err msg

commit c4673f7
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Wed Nov 29 16:45:36 2023 +0300

    ipset: imp log msg

commit abf8977
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Wed Nov 29 15:29:36 2023 +0300

    ipset: header data query
Squashed commit of the following:

commit 6552543
Merge: a6c5079 2965d1f
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Fri Dec 1 10:02:29 2023 +0200

    Merge remote-tracking branch 'origin/master' into upd-dnsproxy

commit a6c5079
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Thu Nov 30 14:55:15 2023 +0200

    dnsforward: imp code

commit 5bd6805
Merge: 094a9c9 0e4e243
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Thu Nov 30 10:56:58 2023 +0200

    Merge remote-tracking branch 'origin/master' into upd-dnsproxy

commit 094a9c9
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Thu Nov 30 10:54:39 2023 +0200

    all: upd dnsproxy
@annguyen0 annguyen0 merged commit 236d5ab into annguyen0:master Dec 2, 2023
5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants