Merge branch 'master' into assistant

Conflicts:
	debian/changelog

Updated changelog for assistant and webapp
This commit is contained in:
Joey Hess 2012-08-27 13:31:54 -04:00
commit b12db9ef92
17 changed files with 284 additions and 11 deletions

17
debian/changelog vendored
View file

@ -1,13 +1,22 @@
git-annex (3.20120808) UNRELEASED; urgency=low
git-annex (3.20120826) UNRELEASED; urgency=low
* assistant: New command, a daemon which does everything watch does,
as well as automatically syncing file contents between repositories.
* webapp: New command (and FreeDesktop menu item) that allows managing
and configuring the assistant in a web browser.
* init: If no description is provided for a new repository, one will
automatically be generated, like "joey@gnu:~/foo"
-- Joey Hess <joeyh@debian.org> Mon, 27 Aug 2012 13:27:39 -0400
git-annex (3.20120825) unstable; urgency=low
* S3: Add fileprefix setting.
* Pass --use-agent to gpg when in no tty mode. Thanks, Eskild Hustvedt.
* init: If no description is provided for a new repository, one will
automatically be generated, like "joey@gnu:~/foo"
* Bugfix: Fix fsck in SHA*E backends, when the key contains composite
extensions, as added in 3.20120721.
-- Joey Hess <joeyh@debian.org> Thu, 09 Aug 2012 13:51:47 -0400
-- Joey Hess <joeyh@debian.org> Sat, 25 Aug 2012 10:00:10 -0400
git-annex (3.20120807) unstable; urgency=low