merge bugs

3 files changed, 21 insertions, 0 deletions

diff --git a/doc/bugs/Endless_SSH_password_prompts.mdwn b/doc/bugs/Endless_SSH_password_prompts.mdwn
index fad730a1b..6a180f274 100644
--- a/doc/bugs/Endless_SSH_password_prompts.mdwn
+++ b/doc/bugs/Endless_SSH_password_prompts.mdwn
@@ -32,3 +32,7 @@ I don't understand why this is happening.
 > line, they can also read the dialog box ssh pops up, ignore the 
 > misleading "passphrase request" in the title, and see that it's actually
 > prompting about a host key change. --[[Joey]]
+>
+> Update: See [[bugs/kill_git-annex_assistant_on_logout]] -- the fact that
+> it happened after logging back in suggests that was the actual cause of
+> this problem. --[[Joey]]
diff --git a/doc/bugs/flooding_me_with_ssh_password_prompts.mdwn b/doc/bugs/flooding_me_with_ssh_password_prompts.mdwn
index 191ad0250..0d513d459 100644
--- a/doc/bugs/flooding_me_with_ssh_password_prompts.mdwn
+++ b/doc/bugs/flooding_me_with_ssh_password_prompts.mdwn
@@ -40,3 +40,8 @@ It's unclear - i guess you need to setup git-annex to autostart and sync with re
 ### What version of git-annex are you using? On what operating system?
 
 5.20140927~bpo70+3 on debian wheezy.
+
+> The git-annex daemon being a "leftover" from a previous session seems
+> like the root cause. We have a new bug for this,
+> [[bugs/kill_git-annex_assistant_on_logout]], so I am going to close this
+> one as a dup. [[done]] --[[Joey]]
diff --git a/doc/bugs/kill_git-annex_assistant_on_logout/comment_1_35ad241515014f1c85668c6152538fb9._comment b/doc/bugs/kill_git-annex_assistant_on_logout/comment_1_35ad241515014f1c85668c6152538fb9._comment
new file mode 100644
index 000000000..824fcbfaf
--- /dev/null
+++ b/doc/bugs/kill_git-annex_assistant_on_logout/comment_1_35ad241515014f1c85668c6152538fb9._comment
@@ -0,0 +1,12 @@
+[[!comment format=mdwn
+ username="joey"
+ subject="""comment 1"""
+ date="2015-07-02T17:05:15Z"
+ content="""
+Thanks, some people have reported repeated ssh-agent prompts, and this is
+the first one that fingered logout as contributing to the problem.
+(Reading through the past reports, that all had hints about logout.)
+
+So, we need to get a desktop file to stop git-annex on logout. If that's
+even possible.
+"""]]