Sync with Nix

2016-02-24 14:04:31 +01:00
parent 7b509237cd
commit 8321a3eb27
12 changed files with 50 additions and 229 deletions
--- a/src/hydra-queue-runner/s3-binary-cache-store.hh
+++ b/src/hydra-queue-runner/s3-binary-cache-store.hh
@@ -20,7 +20,7 @@ private:

 public:

-    S3BinaryCacheStore(const StoreFactory & storeFactory,
+    S3BinaryCacheStore(std::shared_ptr<Store> localStore,
        const Path & secretKeyFile, const Path & publicKeyFile,
        const std::string & bucketName);