summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-10-23 15:05:57 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-10-23 15:05:57 -0400
commit7a70e3f1454a4c83388e925925ff8fd9353e1c0e (patch)
treec647886f56797d504ba31e71d0a6ec54847d45a2
parentdcca572a4d95b5bf926468c30e8a01413b665323 (diff)
update
-rw-r--r--debian/changelog2
-rw-r--r--doc/design/assistant/disaster_recovery.mdwn10
2 files changed, 7 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog
index d0faccd40..2405116ad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ git-annex (4.20131003) UNRELEASED; urgency=low
webapp.
* repair: New command, which can repair damaged git repositories
(even ones not using git-annex).
+ * webapp: When git repository damange is detected, repairs can be
+ done using the webapp UI.
* Automatically and safely detect and recover from dangling
.git/annex/index.lock files, which would prevent git from
committing to the git-annex branch, eg after a crash.
diff --git a/doc/design/assistant/disaster_recovery.mdwn b/doc/design/assistant/disaster_recovery.mdwn
index 798b0fea5..abf2f9814 100644
--- a/doc/design/assistant/disaster_recovery.mdwn
+++ b/doc/design/assistant/disaster_recovery.mdwn
@@ -67,13 +67,13 @@ scheduled. Without being annoying about it.
TODO: If committing to the repository fails, after resolving any dangling
lock files (see above), it should git fsck.
-If git fsck finds problems, launch git repository repair.
+If git fsck finds problems, launch git repository repair. **done**
-TODO: git annex fsck --fast at end of repository repair to ensure
-git-annex branch is accurate.
+git annex fsck --fast at end of repository repair to ensure
+git-annex branch is accurate. **done**
-TODO: along with displaying alert when there is a problem, send an email
-alert. (Using system MTA?)
+TODO: along with displaying alert when there is a problem detected
+by consistency check, send an email alert. (Using system MTA?)
## git repository repair