diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-04-14 14:20:10 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-04-14 14:20:10 -0400 |
| commit | c9de9610c5d4ba68c0cfdb2a567f2431ee034674 (patch) | |
| tree | 5e8623e450f7872624a96b377b481fc43c43df8b | |
| parent | 0564335c2218cf85d8c451fc9060b27101e30cb0 (diff) | |
fix RESUME
| -rw-r--r-- | RemoteDaemon/Core.hs | 4 | ||||
| -rw-r--r-- | doc/design/git-remote-daemon.mdwn | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/RemoteDaemon/Core.hs b/RemoteDaemon/Core.hs index b3cfe67b2..0be9c93f0 100644 --- a/RemoteDaemon/Core.hs +++ b/RemoteDaemon/Core.hs @@ -76,10 +76,10 @@ runController ichan ochan = do -- ssh remotes, it's only done once) liftAnnex h forceSshCleanup broadcast LOSTNET m - go h True M.empty + go h True m PAUSE -> do broadcast STOP m - go h True M.empty + go h True m RESUME -> do when paused $ startrunning m diff --git a/doc/design/git-remote-daemon.mdwn b/doc/design/git-remote-daemon.mdwn index fbc28859b..56afa409a 100644 --- a/doc/design/git-remote-daemon.mdwn +++ b/doc/design/git-remote-daemon.mdwn @@ -105,7 +105,7 @@ the webapp. * `RESUME` - Undoes PAUSE or DISCONNECTED. + Undoes PAUSE or LOSTNET. Start back up network connections. * `CHANGED ref ...` |