mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'master' into smudge

Browse source
This commit is contained in:
Joey Hess 2015-12-15 12:01:21 -04:00
commit f5d4ee9b63
Failed to extract signature
3 changed files with 9 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
debian/changelog vendored
View file

@ -20,6 +20,7 @@ git-annex (5.20151209) UNRELEASED; urgency=medium
* webdav: When testing the WebDAV server, send a file with content. * webdav: When testing the WebDAV server, send a file with content.
The empty file it was sending tickled bugs in some php WebDAV server. The empty file it was sending tickled bugs in some php WebDAV server.
* fsck: Failed to honor annex.diskreserve when checking a remote. * fsck: Failed to honor annex.diskreserve when checking a remote.
* Debian: Build depend on concurrent-output.
-- Joey Hess <id@joeyh.name> Thu, 10 Dec 2015 11:39:34 -0400 -- Joey Hess <id@joeyh.name> Thu, 10 Dec 2015 11:39:34 -0400

1
debian/control vendored
View file

@ -71,6 +71,7 @@ Build-Depends:
libghc-tasty-rerun-dev, libghc-tasty-rerun-dev,
libghc-optparse-applicative-dev (>= 0.11.0), libghc-optparse-applicative-dev (>= 0.11.0),
libghc-torrent-dev, libghc-torrent-dev,
libghc-concurrent-output-dev,
lsof [linux-any], lsof [linux-any],
ikiwiki, ikiwiki,
perlmagick, perlmagick,

7
doc/devblog/day_344-345__smudging_along.mdwn Normal file
View file

@ -0,0 +1,7 @@
New special remote alert! Chris Kastorff has made
[a special remote supporting Backblaze's B2 storage servie](https://github.com/encryptio/git-annex-remote-b2).
And I'm still working on v6 unlocked files. After beating on it for 2 more
days, all git-annex commands should support them. There is still plenty
of work to do on testing, upgrading, optimisation, merge conflict resolution,
and reconciling staged changes.