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.

Sign up for GitHub

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

Jump to bottom

Dev/franku/bareos 18.2/stop timer before return from function #311

Merged
merged 2 commits into from Oct 28, 2019
Merged

Dev/franku/bareos 18.2/stop timer before return from function #311

merged 2 commits into from Oct 28, 2019

Conversation

franku
Copy link
Contributor

@franku franku commented Oct 25, 2019

Fixes to separate bugs

@franku
bsock: stop timer before return from function
5a92516 
 Fixes #1123: Director can crash during TwoWay Authentication
@franku
console: stop bsock timer before leaving scope of function
7292024 
 Fixes #1064: bconsole crashes after 5 minutes in restore operation due to forgotten watchdog
@franku franku requested a review from arogge October 25, 2019 12:20
arogge
arogge approved these changes Oct 25, 2019
View reviewed changes
Copy link
Member

@arogge arogge left a comment

Choose a reason for hiding this comment

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

Looks like the one for master, so as soon as it has built you can merge it.

@franku franku merged commit cd43cb7 into bareos-18.2 Oct 28, 2019
@franku franku deleted the dev/franku/bareos-18.2/stop_timer_before_return_from_function branch October 28, 2019 09:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@arogge arogge arogge approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@franku @arogge