diff options
| author |  Joey Hess <joey@kitenet.net> | 2011-03-28 16:34:58 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-03-28 16:34:58 -0400 |
| commit | 996e5eee01c83e6a95b51ac10ed5d2b39616d092 (patch) | |
| tree | be2ed7e52c1f48598f8851c40262d4555e2df3da /debian | |
| parent | a87822bbb29559919ef74bcc8cc29cca128831f5 (diff) | |
| parent | 3b2cbf21040d36c032f657c25ad2e85b90e1b380 (diff) | |
Merge branch 'master' into s3
Conflicts:
debian/changelog
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 825382256..4c0c9f741 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ git-annex (0.20110329) UNRELEASED; urgency=low * Amazon S3 is now supported as a special type of remote. Warning: Encrypting data before sending it to S3 is not currently supported. + * fsck: Ensure that files and directories in .git/annex/objects + have proper permissions. -- Joey Hess <joeyh@debian.org> Sat, 26 Mar 2011 14:36:16 -0400 |