Merge pull request #1059 from mozilla-services/release/0.10-merge

chore: tag 0.10.2

CHANGELOG.md

@@ -1,3 +1,13 @@
+<a name="0.10.2"></a>
+## 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))
+
+
+
 <a name="0.10.1"></a>
 ## 0.10.1 (2021-04-14)
 

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "syncstorage"
-version = "0.10.1"
+version = "0.10.2"
 license = "MPL-2.0"
 authors = [
   "Ben Bangert <[email protected]>",
@@ -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"] }