summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Utility/Scheduled.hs2
-rw-r--r--debian/changelog6
2 files changed, 7 insertions, 1 deletions
diff --git a/Utility/Scheduled.hs b/Utility/Scheduled.hs
index 2b7cae2b6..45914aada 100644
--- a/Utility/Scheduled.hs
+++ b/Utility/Scheduled.hs
@@ -121,7 +121,7 @@ calcNextTime (Schedule recurrance scheduledtime) lasttime currenttime
| otherwise -> skip 1
Monthly Nothing
| afterday -> skip 1
- | maybe True (\old -> mnum candidate > mnum old && mday candidate >= (mday old `mod` minmday)) lastday ->
+ | maybe True (\old -> mday candidate > mday old && mday candidate >= (mday old `mod` minmday)) lastday ->
-- Window only covers current month,
-- in case there is a Divisible requirement.
Just $ window candidate (endOfMonth candidate)
diff --git a/debian/changelog b/debian/changelog
index 0c0bfafdb..c3952f28f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+git-annex (5.20140412) UNRELEASED; urgency=high
+
+ * Last release didn't quite fix the high cpu issue in all cases, this should.
+
+ -- Joey Hess <joeyh@debian.org> Fri, 11 Apr 2014 17:13:07 -0400
+
git-annex (5.20140411) unstable; urgency=high
* importfeed: Filename template can now contain an itempubdate variable.