summaryrefslogtreecommitdiff
path: root/CHANGELOG
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2016-12-13 11:07:49 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2016-12-13 11:07:49 -0400
commitc254d141bec24c0cb2931247cac8d4c8bd4105be (patch)
tree3074da422e8eab7510dd0356385d67a71d4dd0bc /CHANGELOG
parent1d359620940f5b8c2476c5a32ee9922b5d53bb4f (diff)
metadata --batch: Fix bug when conflicting metadata changes were made in the same batch run.
1 microsecond delay is ugly.. but, maintaining an queue of a list of timestamps and taking a new one from the queue each time around, or maintaining a timestamp counter, would probably be slower.
Diffstat (limited to 'CHANGELOG')
-rw-r--r--CHANGELOG2
1 files changed, 2 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 697814280..839af6559 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,8 @@
git-annex (6.20161211) UNRELEASED; urgency=medium
* Debian: Build webapp on armel.
+ * metadata --batch: Fix bug when conflicting metadata changes were
+ made in the same batch run.
-- Joey Hess <id@joeyh.name> Sun, 11 Dec 2016 21:29:51 -0400