Merge branch 'glacier'

Conflicts:
	debian/changelog
This commit is contained in:
Joey Hess 2013-06-11 10:34:55 -04:00
commit 8be3e9baa2
2 changed files with 3 additions and 3 deletions

View file

@ -195,14 +195,12 @@ checkPresent r k = do
, Param $ archive r k
]
untrusted = do
showLongNote $ unlines
untrusted = return $ Left $ unlines
[ "Glacier's inventory says it has a copy."
, "However, the inventory could be out of date, if it was recently removed."
, "(Use --trust-glacier if you're sure it's still in Glacier.)"
, ""
]
return $ Right False
glacierAction :: Remote -> [CommandParam] -> Annex Bool
glacierAction r params = runGlacier (config r) (uuid r) params

2
debian/changelog vendored
View file

@ -10,6 +10,8 @@ git-annex (4.20130602) UNRELEASED; urgency=low
* webapp: When the user switches to display a different repository,
that repository becomes the default repository to be displayed next time
the webapp gets started.
* glacier: Better handling of the glacier inventory, which avoids
duplicate uploads to the same glacier repository by `git annex copy`.
-- Joey Hess <joeyh@debian.org> Mon, 10 Jun 2013 12:52:44 -0400