diff options
| -rw-r--r-- | Annex/Ssh.hs | 2 | ||||
| -rw-r--r-- | debian/changelog | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/Annex/Ssh.hs b/Annex/Ssh.hs index 583a590ae..bd10a40d4 100644 --- a/Annex/Ssh.hs +++ b/Annex/Ssh.hs @@ -146,7 +146,7 @@ sshCleanup = go =<< sshCacheDir withQuietOutput createProcessSuccess $ (proc "ssh" $ toCommand $ [ Params "-O stop" - ] ++ params ++ [Param "any"]) + ] ++ params ++ [Param "localhost"]) { cwd = Just dir } liftIO $ nukeFile socketfile -- Cannot remove the lock file; other processes may diff --git a/debian/changelog b/debian/changelog index 85cb72cde..29399c4fb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,8 @@ git-annex (5.20140307) UNRELEASED; urgency=medium the repository's description will now fail when multiple repositories match, rather than picking a repository at random. (So will --in=) + * Fix ssh connection caching stop method to work with openssh 6.5p1, + which broke the old method. -- Joey Hess <joeyh@debian.org> Thu, 06 Mar 2014 16:17:01 -0400 |