From 5fa2ec4a7c99f4f3ec9c9fbecc55d7d12cb71df6 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 7 Jul 2014 12:25:06 -0400 Subject: prep release --- debian/changelog | 26 +++++++++++++------------- git-annex.cabal | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/debian/changelog b/debian/changelog index 043138642..7057501fa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,28 +1,28 @@ -git-annex (5.20140614) UNRELEASED; urgency=medium +git-annex (5.20140707) unstable; urgency=medium + * assistant: Fix bug, introduced in last release, that caused the assistant + to make many unncessary empty merge commits. * assistant: Fix one-way assistant->assistant sync in direct mode. - * Windows: Got rid of that pesky DOS box when starting the webapp. - * Windows: Added Startup menu item so assistant starts automatically - on login. - * Windows: Fix opening file browser from webapp when repo is in a - directory with spaces. - * Windows: Assistant now logs to daemon.log. * Fix bug in annex.queuesize calculation that caused much more queue flushing than necessary. - * Run standalone install process when the assistant is started - (was only being run when the webapp was opened). * importfeed: When annex.genmetadata is set, metadata from the feed is added to files that are imported from it. - * Android: patch git to avoid fchmod, which fails on /sdcard. * Support users who have set commit.gpgsign, by disabling gpg signatures for git-annex branch commits and commits made by the assistant. * Fix memory leak when committing millions of changes to the git-annex branch, eg after git-annex add has run on 2 million files in one go. - * assistant: Fix bug, introduced in last release, that caused the assistant - to make many unncessary empty merge commits. * Support building with bloomfilter 2.0.0. + * Run standalone install process when the assistant is started + (was only being run when the webapp was opened). + * Android: patch git to avoid fchmod, which fails on /sdcard. + * Windows: Got rid of that pesky DOS box when starting the webapp. + * Windows: Added Startup menu item so assistant starts automatically + on login. + * Windows: Fix opening file browser from webapp when repo is in a + directory with spaces. + * Windows: Assistant now logs to daemon.log. - -- Joey Hess Mon, 16 Jun 2014 11:28:42 -0400 + -- Joey Hess Mon, 07 Jul 2014 12:24:13 -0400 git-annex (5.20140613) unstable; urgency=medium diff --git a/git-annex.cabal b/git-annex.cabal index bb583ecc9..75d65e1d6 100644 --- a/git-annex.cabal +++ b/git-annex.cabal @@ -1,5 +1,5 @@ Name: git-annex -Version: 5.20140613 +Version: 5.20140707 Cabal-Version: >= 1.8 License: GPL-3 Maintainer: Joey Hess -- cgit v1.2.3