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

chore: merge emqx-OTP-25.3.2 into emqx-OTP-26.1.2 and prepare to tag 26.1.2-1 #43

Merged

Conversation

thalesmg
Copy link

No description provided.

zmstone and others added 26 commits December 5, 2022 17:38
In this commit, a new option `ipv6_probe` is added for
gen_tcp:connect API.
The option can either be a proplist boolean flag
or a timeout non-neg-integer or `infinity`
When this option is provided, gen_tcp will try to connect
the target with ipv6, then fallback to default options
if failed to connect.
When a new node is added to the mnesia cluster, it selects a random node
to copy the table from if no 'master' node is defined (set master node
is not mandatory).

by setting arg: 'copy_from_node', operator is now free to choice
which node to copy from.

default is 'undefined', means disable.

note, if the specified node is not in the candidates list, it will fallback to
default behavior.
Merge pull request erlang#20 from emqx/mnesia-post-commit-hook-emqx-OTP-24.1.5
…(OTP 25.1.2)

Merge pull request erlang#25 from thalesmg/ocsp-stapling-tmg-otp24
chore: port relevant `emqx-OTP-24.3.4` patches to `emqx-OTP-25.1.2`
feat(ssl): no warning log when using verify_none
They are legal `Address`es to connect to.
fix(ipv6_probe): handle local sockets properly
fix(vsn): bump OTP version to 25.1.2-2
…-mnesia-hook-to-otp-25

Mnesia/port unregister mnesia hook to otp 25
…ive-data-mnesia-hook-log

EMQX-10390 hide sensitive data in mnesia hook log
@thalesmg thalesmg force-pushed the merge-25-3-2-to-26-1-2-20231121 branch 3 times, most recently from 2a5c46b to 4feedc8 Compare November 21, 2023 17:17
@thalesmg thalesmg force-pushed the merge-25-3-2-to-26-1-2-20231121 branch from 4feedc8 to eed9fec Compare November 21, 2023 18:39
@thalesmg thalesmg marked this pull request as ready for review November 21, 2023 21:01
@thalesmg
Copy link
Author

The CI failures are apparently unrelated to the changes herein:

image

@thalesmg thalesmg merged commit 281447f into emqx:emqx-OTP-26.1.2 Nov 22, 2023
17 of 18 checks passed
@thalesmg thalesmg deleted the merge-25-3-2-to-26-1-2-20231121 branch November 22, 2023 11:58
@thalesmg
Copy link
Author

tagged OTP-26.1.2-1

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants