Merge branch 'master' into s3

Conflicts:
	debian/changelog
This commit is contained in:
Joey Hess 2011-03-28 16:34:58 -04:00
commit 996e5eee01
6 changed files with 46 additions and 1 deletions

View file

@ -4,3 +4,5 @@ The fsck command should check that they are still correct.
The fix command should fix them.
PS: Thanks for this nice tool!
> Good idea, [[done]] (actually, fsck just fixes them too)! --[[Joey]]

View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus"
nickname="Jimmy"
subject="comment 2"
date="2011-03-28T18:35:50Z"
content="""
I think the forums/website currently is sufficient, I do at times wish there was a mailing list or anonymous git push to the wiki as I find editing posts through the web browser is some times tedious (the lack of !fmt or alt-q bugs me at times ;) ). The main advantage of keeping stuff on the site/forum is that everything gets saved and passed on to anyone who checks out the git repo of the code base.
"""]]

View file

@ -0,0 +1,14 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U"
nickname="Richard"
subject="comment 2"
date="2011-03-28T17:47:38Z"
content="""
On the plus side, the past me wanted exactly what I had in mind.
On the meh side, I really forgot about this conversation :/
When you say this todo is not a priority, does that mean there's no ETA at all and that it will most likely sleep for a long time? Or the almost usual \"what the heck, I will just wizard it up in two lines of haskell\"?
-- RichiH
"""]]

View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="http://joey.kitenet.net/"
nickname="joey"
subject="comment 3"
date="2011-03-28T20:05:13Z"
content="""
Probably more like 150 lines of haskell. Maybe just 50 lines if the bup repository is required to be on the same computer as the git-annex repository.
Since I do have some repositories where I'd appreciate this level of assurance that data not be lost, it's mostly a matter of me finding a free day.
"""]]