diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-12-13 12:05:05 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-12-13 12:12:38 -0400 |
| commit | f1f846bfce78f6ee82eccd93e3dbb0bd1d559e8a (patch) | |
| tree | 09e92fcac0c6f0a1cdd4899f6ad33ae1f7585570 /Annex/Locations.hs | |
| parent | 0e4bd345ac17e95b1e2d0b547d1c7be669a00af1 (diff) | |
Revert ServerAliveInterval
Revert ServerAliveInterval change in 6.20161111, which caused problems
with too many old versions of ssh and unusual ssh configurations.
It should have not been needed anyway since ssh is supposted to
have TCPKeepAlive enabled by default.
Diffstat (limited to 'Annex/Locations.hs')
| -rw-r--r-- | Annex/Locations.hs | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/Annex/Locations.hs b/Annex/Locations.hs index 9f829fda1..a6af4d417 100644 --- a/Annex/Locations.hs +++ b/Annex/Locations.hs @@ -63,7 +63,6 @@ module Annex.Locations ( gitAnnexUrlFile, gitAnnexTmpCfgFile, gitAnnexSshDir, - gitAnnexSshConfig, gitAnnexRemotesDir, gitAnnexAssistantDefaultDir, HashLevels(..), @@ -403,10 +402,6 @@ gitAnnexTmpCfgFile r = gitAnnexDir r </> "config.tmp" gitAnnexSshDir :: Git.Repo -> FilePath gitAnnexSshDir r = addTrailingPathSeparator $ gitAnnexDir r </> "ssh" -{- .git/annex/ssh.config is used to configure ssh. -} -gitAnnexSshConfig :: Git.Repo -> FilePath -gitAnnexSshConfig r = gitAnnexDir r </> "ssh.config" - {- .git/annex/remotes/ is used for remote-specific state. -} gitAnnexRemotesDir :: Git.Repo -> FilePath gitAnnexRemotesDir r = addTrailingPathSeparator $ gitAnnexDir r </> "remotes" |