diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2023-01-06 10:35:20 -0500 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2023-01-06 10:35:20 -0500 |
| commit | e9fc1e4fdb0ab5adb6b163c3db361b86a4f5c69b (patch) | |
| tree | 25522f96d7aa54f7c93ba3c5e187374d3a50dfe6 /src/libstore/daemon.cc | |
| parent | 55caef36ed1cee2e924c82cf49b3ceb17bdde910 (diff) | |
| parent | 3172c51baff5c81362fcdafa2e28773c2949c660 (diff) | |
Merge remote-tracking branch 'upstream/master' into path-info
Diffstat (limited to 'src/libstore/daemon.cc')
| -rw-r--r-- | src/libstore/daemon.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/libstore/daemon.cc b/src/libstore/daemon.cc index a59fbae3c..6407e575a 100644 --- a/src/libstore/daemon.cc +++ b/src/libstore/daemon.cc @@ -238,7 +238,8 @@ struct ClientSettings } else if (trusted || name == settings.buildTimeout.name - || name == settings.buildRepeat.name + || name == settings.maxSilentTime.name + || name == settings.pollInterval.name || name == "connect-timeout" || (name == "builders" && value == "")) settings.set(name, value); |