From 0165d7f6d11f03ff8d281492828e3f2146f1b8d3 Mon Sep 17 00:00:00 2001
From: Stjepan Glavina <stjepang@gmail.com>
Date: Wed, 27 Nov 2019 16:08:57 +0100
Subject: [PATCH] Add missing items to the changelog

---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5c9283f..533dcaf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -42,10 +42,13 @@ assert_eq!(right, [2, 4]);
 ## Changed
 
 - Enabled CI on master branch.
+- `Future::join` and `Future::try_join` can now join futures with different
+  output types.
 
 ## Fixed
 
 - Fixed the docs and `Debug` output of `BufWriter`.
+- Fixed a bug in `Stream::throttle` that made it consume too much CPU.
 
 # [1.1.0] - 2019-11-21