From 54e2e699bfcbf80d9bf32eeb437163b8d6e64b54 Mon Sep 17 00:00:00 2001
From: Pierre Fersing <pierre.fersing@bleemeo.com>
Date: Mon, 29 Apr 2024 21:33:35 +0200
Subject: [PATCH] Update changelog

---
 CONTRIBUTING.md |  1 +
 ChangeLog.txt   | 13 +++++++++++++
 2 files changed, 14 insertions(+)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 692cf429..8a5f7eaf 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -92,6 +92,7 @@ Making a release
 The process to make a release is the following:
 * Update the Changelog with the release version and date. Ensure it's up-to-date with latest fixes & PRs merged.
 * Make sure test pass, check that Github actions are green.
+* Check that documentation build (`cd docs; make html`)
 * Bump the version number in ``paho/mqtt/__init__.py``, commit the change.
 * Make a dry-run of build:
    * Build using hatch: ``python -m hatch build``
diff --git a/ChangeLog.txt b/ChangeLog.txt
index 0fe57af8..61ecc4d7 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,16 @@
+v2.1.0 - 2024-04-29
+===================
+
+- Make transition from 1.x to 2.x version smoother (Closes #831)
+- Fix "protocol" property (Closes #820)
+- Fix publish() a bytearray payload (Closes #833)
+- Fix some type annotations (Closes #828)
+- Fix loop_stop() not stopping thread when called from callback (Closes #809)
+- Fix some documentation errors (Closes #817, #823, #832, #838)
+- Add support for Unix socket (Closes #829)
+- Fix flaky test (Closes #789)
+
+
 v2.0.0 - 2024-02-10
 ===================