diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2021-01-22 16:22:00 +0000 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2021-01-22 16:22:00 +0000 |
| commit | 5738b08233022b8cb74b1550ac0fe9d620ff52cd (patch) | |
| tree | 886f1ee22f92a240f235df1eecfdad8e505f4d15 /src/libstore/remote-store.cc | |
| parent | bd96403da6a1181e46a52be7befade0c00f9e743 (diff) | |
| parent | b7bfc7ee52dd425e0156f369eb4c05a62358f912 (diff) | |
Merge remote-tracking branch 'upstream/master' into trustless-remote-builder-simple
Diffstat (limited to 'src/libstore/remote-store.cc')
| -rw-r--r-- | src/libstore/remote-store.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstore/remote-store.cc b/src/libstore/remote-store.cc index f1f4d0516..be07f02dc 100644 --- a/src/libstore/remote-store.cc +++ b/src/libstore/remote-store.cc @@ -77,8 +77,8 @@ void write(const Store & store, Sink & out, const std::optional<ContentAddress> /* TODO: Separate these store impls into different files, give them better names */ RemoteStore::RemoteStore(const Params & params) - : Store(params) - , RemoteStoreConfig(params) + : RemoteStoreConfig(params) + , Store(params) , connections(make_ref<Pool<Connection>>( std::max(1, (int) maxConnections), [this]() { |