diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-11-06 13:02:35 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-11-06 13:02:35 -0400 |
| commit | 4a79d9434a5dee771376e1fdc77c3ddf1c99e99d (patch) | |
| tree | fca0e315c061dc4d2e8a04a6a7aa538cc91ecbd0 /debian/changelog | |
| parent | b9d5c418cd5eb89e6ea2de58559da4fe9f487934 (diff) | |
| parent | 8c0c91f03c4d17e301b16f9607a54cc08d1a0e92 (diff) | |
Merge branch 'master' into directguard
Diffstat (limited to 'debian/changelog')
| -rw-r--r-- | debian/changelog | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 63ecf4e6c..a99b57424 100644 --- a/debian/changelog +++ b/debian/changelog @@ -23,6 +23,27 @@ git-annex (5.20131102) UNRELEASED; urgency=low -- Joey Hess <joeyh@debian.org> Sat, 02 Nov 2013 14:54:36 -0400 +git-annex (4.20131106) unstable; urgency=low + + * Improve local pairing behavior when two computers both try to start + the pairing process separately. + * sync: Work even when the local git repository is new and empty, + with no master branch. + * gcrypt, bup: Fix bug that prevented using these special remotes + with encryption=pubkey. + * Fix enabling of gcrypt repository accessed over ssh; + git-annex-shell gcryptsetup had a bug that caused it to fail + with permission denied. + * Fix zombie process that occurred when switching between repository + views in the webapp. + * map: Work when there are gcrypt remotes. + * Fix build w/o webapp. + * Fix exception handling bug that could cause .git/annex/index to be used + for git commits outside the git-annex branch. Known to affect git-annex + when used with the git shipped with Ubuntu 13.10. + + -- Joey Hess <joeyh@debian.org> Wed, 06 Nov 2013 11:17:47 -0400 + git-annex (4.20131101) unstable; urgency=low * The "git annex content" command is renamed to "git annex wanted". |