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

Merge branch 'master' into remotecontrol

Browse source 
Conflicts:
	doc/devblog/day_152__more_ssh_connection_caching.mdwn
This commit is contained in:
Joey Hess 2014-04-14 13:38:35 -04:00
commit 138d25518d
20 changed files with 93 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

1
debian/changelog vendored
View file

@ -13,6 +13,7 @@ git-annex (5.20140413) UNRELEASED; urgency=medium
* remotedaemon: When network connection is lost, close all cached ssh
connections.
* Improve handling on monthly/yearly scheduling.
* Avoid depending on shakespeare except for when building the webapp.
-- Joey Hess <joeyh@debian.org> Fri, 11 Apr 2014 21:33:35 -0400

1
debian/control vendored
View file

@ -35,6 +35,7 @@ Build-Depends:
libghc-yesod-static-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64 powerpc sparc],
libghc-yesod-default-dev [i386 amd64 kfreebsd-amd64 powerpc sparc],
libghc-hamlet-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64 powerpc sparc],
libghc-shakespeare-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64 powerpc sparc],
libghc-clientsession-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64 powerpc sparc],
libghc-warp-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64 powerpc sparc],
libghc-warp-tls-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64 powerpc sparc],