diff --git a/CHANGELOG.md b/CHANGELOG.md index 581f2f3c12..9413e5b5bd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,13 @@ + +## 0.10.2 (2021-04-28) + + +#### Bug Fixes + +* update deadpool w/ the incorrect pool stats fix (#1057) ([d261ac1e](https://github.com/mozilla-services/syncstorage-rs/commit/d261ac1ebcc1ed3ff2871e5fd61ab4a934149fcd), closes [#803](https://github.com/mozilla-services/syncstorage-rs/issues/803)) + + + ## 0.10.1 (2021-04-14) diff --git a/Cargo.lock b/Cargo.lock index 346fe11a3c..641b4cb9da 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -766,8 +766,7 @@ dependencies = [ [[package]] name = "deadpool" version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4aaff9a7a1de9893f4004fa08527b31cb2ae4121c44e053cf53f29203c73bd23" +source = "git+https://github.com/mozilla-services/deadpool?branch=deadpool-v0.5.2-issue92#ede2a1f1fa22a7266cf4681edd2b988dfd333af9" dependencies = [ "async-trait", "config", @@ -2930,7 +2929,7 @@ dependencies = [ [[package]] name = "syncstorage" -version = "0.10.1" +version = "0.10.2" dependencies = [ "actix-cors", "actix-http", diff --git a/Cargo.toml b/Cargo.toml index cedb2d1d92..d1d73f59f6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "syncstorage" -version = "0.10.1" +version = "0.10.2" license = "MPL-2.0" authors = [ "Ben Bangert ", @@ -27,8 +27,10 @@ bytes = "1.0" cadence = "0.24" chrono = "0.4" config = "0.10" -# Pin to 0.5 for now, to keep it under tokio 0.2 (issue977) -deadpool = "0.5" # pin to 0.5 +# Pin to 0.5 for now, to keep it under tokio 0.2 (issue977). +# Fix for #803 (deadpool#92) points to our fork for now +#deadpool = "0.5" # pin to 0.5 +deadpool = { git = "https://github.com/mozilla-services/deadpool", branch = "deadpool-v0.5.2-issue92" } diesel = { version = "1.4", features = ["mysql", "r2d2"] } diesel_logger = "0.1.1" diesel_migrations = { version = "1.4.0", features = ["mysql"] }