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

Fix for parse_iso_time_tz error with musl library (backport #1644) #1650

Merged
merged 3 commits into from
Jul 29, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 29, 2021

This is an automatic backport of pull request #1644 done by Mergify.
Cherry-pick of 30e2c61 has failed:

On branch mergify/bp/gvmd-20.08/pr-1644
Your branch is up to date with 'origin/gvmd-20.08'.

You are currently cherry-picking commit 30e2c6113.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   src/manage.c
	modified:   src/manage_sql.c
	modified:   src/utils.c

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


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.io/

fcolista and others added 2 commits July 29, 2021 06:09
This patch fixes the error when parsing the time in a format like:
2019-01-18T17:29:00+00:00  with musl.

This behavior is described in the issue #1609

(cherry picked from commit 30e2c61)

# Conflicts:
#	CHANGELOG.md
(cherry picked from commit a430a21)
@mergify mergify bot requested a review from a team as a code owner July 29, 2021 06:09
@mergify mergify bot added the conflicts This backport pull request has merge conflicts that need to be resolved label Jul 29, 2021
@timopollmeier timopollmeier added conflicts-resolved This backport pull request had merge conflicts that have been resolved and removed conflicts This backport pull request has merge conflicts that need to be resolved labels Jul 29, 2021
@timopollmeier timopollmeier merged commit b3a8518 into gvmd-20.08 Jul 29, 2021
@timopollmeier timopollmeier deleted the mergify/bp/gvmd-20.08/pr-1644 branch July 29, 2021 06:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
conflicts-resolved This backport pull request had merge conflicts that have been resolved
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants