From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Wed, 24 May 2023 12:39:32 +0000 (+0200)
Subject: Merge pull request #27752 from DaanDeMeyer/timer-oncalendar-fix
X-Git-Tag: v254-rc1~395
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0de4bf409cdcf91095f01ad0ea1678f47d81b364;p=thirdparty%2Fsystemd.git

Merge pull request #27752 from DaanDeMeyer/timer-oncalendar-fix

core/timer: Always use inactive_exit_timestamp if it is set
---

0de4bf409cdcf91095f01ad0ea1678f47d81b364