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

Discovery Server fix reconnection [12522] (backport #2246) #2594

Merged
merged 2 commits into from
Jul 21, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 22, 2022

This is an automatic backport of pull request #2246 done by Mergify.


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

* Refs #12522: Fix minor ds errors

Signed-off-by: jparisu <javierparis@eprosima.com>

* Refs #12522: fix typo

Signed-off-by: jparisu <javierparis@eprosima.com>

* Refs #12522: apply suggestions

Signed-off-by: jparisu <javierparis@eprosima.com>

* Refs #12522: Client reconnection fix

Signed-off-by: jparisu <javierparis@eprosima.com>

* Refs #12522: apply suggestions to fix comment

Signed-off-by: jparisu <javierparis@eprosima.com>

* Refs #12522: uncrustify

Signed-off-by: jparisu <javierparis@eprosima.com>

* Refs #12522: Apply new fix

Signed-off-by: jparisu <javierparis@eprosima.com>
(cherry picked from commit 4368260)
MiguelCompany
MiguelCompany previously approved these changes Mar 22, 2022
Copy link
Member

@MiguelCompany MiguelCompany left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@MiguelCompany MiguelCompany added this to the v2.3.5 milestone Apr 12, 2022
@MiguelCompany
Copy link
Member

@richiprosima Please test this

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
@MiguelCompany
Copy link
Member

@richiprosima Please test this

Copy link
Member

@MiguelCompany MiguelCompany left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM with green CI

@MiguelCompany MiguelCompany merged commit 9fda3f3 into 2.3.x Jul 21, 2022
@MiguelCompany MiguelCompany deleted the mergify/bp/2.3.x/pr-2246 branch July 21, 2022 14:35
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.

2 participants