root
/
rabbitmq-server
mirror of https://github.com/rabbitmq/rabbitmq-server.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Resolve conflicts #13256 #13249

This commit is contained in:
Michael Klishin 2025-02-12 15:08:59 -05:00
parent 7abdfc1b00
commit 033f945a15
No known key found for this signature in database
GPG Key ID: 44BF2725475205B2
2 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
deps/rabbitmq_mqtt/test/auth_SUITE.erl vendored
View File

@ -68,17 +68,11 @@ sub_groups() ->
ssl_user_vhost_parameter_mapping_vhost_does_not_exist, ssl_user_vhost_parameter_mapping_vhost_does_not_exist,
ssl_user_cert_vhost_mapping_takes_precedence_over_port_vhost_mapping ssl_user_cert_vhost_mapping_takes_precedence_over_port_vhost_mapping
]}, ]},
<<<<<<< HEAD
{ssl_user_with_client_id_in_cert_san_dns, [],
[client_id_from_cert_san_dns,
invalid_client_id_from_cert_san_dns
=======
{ssl_user_with_invalid_client_id_in_cert_san_dns, [], {ssl_user_with_invalid_client_id_in_cert_san_dns, [],
[invalid_client_id_from_cert_san_dns [invalid_client_id_from_cert_san_dns
]}, ]},
{ssl_user_with_client_id_in_cert_san_dns, [], {ssl_user_with_client_id_in_cert_san_dns, [],
[client_id_from_cert_san_dns [client_id_from_cert_san_dns
>>>>>>> e84a51603 (Fix flake on rabbitmq_mqtt auth_SUITE (#13180))
]}, ]},
{ssl_user_with_client_id_in_cert_san_dns_1, [], {ssl_user_with_client_id_in_cert_san_dns_1, [],
[client_id_from_cert_san_dns_1 [client_id_from_cert_san_dns_1

4
selenium/package.json
View File

@ -12,11 +12,7 @@
"author": "", "author": "",
"license": "ISC", "license": "ISC",
"dependencies": { "dependencies": {
<<<<<<< HEAD
"chromedriver": "^128.0.0",
=======
"chromedriver": "^132.0", "chromedriver": "^132.0",
>>>>>>> e84a51603 (Fix flake on rabbitmq_mqtt auth_SUITE (#13180))
"ejs": "^3.1.8", "ejs": "^3.1.8",
"express": "^4.18.2", "express": "^4.18.2",
"geckodriver": "^3.0.2", "geckodriver": "^3.0.2",