From 9fba4dfe4622b5ee90fda404b7ada9ebe845a095 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Wed, 23 Mar 2022 12:26:03 +1300
Subject: [PATCH 1/3] Bump version to 2022.3.1

---
 Doxygen         | 2 +-
 Makefile        | 2 +-
 _static/version | 2 +-
 conf.py         | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Doxygen b/Doxygen
index d6085a90f..a02a1351a 100644
--- a/Doxygen
+++ b/Doxygen
@@ -38,7 +38,7 @@ PROJECT_NAME           = "ESPHome"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 2022.3.0
+PROJECT_NUMBER         = 2022.3.1
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
diff --git a/Makefile b/Makefile
index e74f62a20..d1c01a422 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 ESPHOME_PATH = ../esphome
-ESPHOME_REF = 2022.3.0
+ESPHOME_REF = 2022.3.1
 
 .PHONY: html html-strict cleanhtml deploy help live-html Makefile netlify netlify-api api netlify-dependencies svg2png copy-svg2png minify
 
diff --git a/_static/version b/_static/version
index 4fb0e32ca..82639dcbb 100644
--- a/_static/version
+++ b/_static/version
@@ -1 +1 @@
-2022.3.0
\ No newline at end of file
+2022.3.1
\ No newline at end of file
diff --git a/conf.py b/conf.py
index ffe7cb20a..77e1bc27f 100644
--- a/conf.py
+++ b/conf.py
@@ -69,7 +69,7 @@ author = "ESPHome"
 # The short X.Y version.
 version = "2022.3"
 # The full version, including alpha/beta/rc tags.
-release = "2022.3.0"
+release = "2022.3.1"
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

From 606e24b94deca05059d01ee9e210b8b13f0249ff Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Wed, 23 Mar 2022 12:26:50 +1300
Subject: [PATCH 2/3] Update changelog for 2022.3.1

---
 changelog/2022.3.0.rst | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/changelog/2022.3.0.rst b/changelog/2022.3.0.rst
index 4395b1272..ad5251040 100644
--- a/changelog/2022.3.0.rst
+++ b/changelog/2022.3.0.rst
@@ -25,6 +25,13 @@ Webserver
 Thanks to :ghuser:`wilberforce` for doing a massive bunch of work on giving new life to the frontend of
 the :doc:`webserver </components/web_server>`.
 
+Release 2022.3.1 - March 23
+---------------------------
+
+- Fix WDT reset during dallas search algorithm :esphomepr:`3293` by :ghuser:`wysiwyng`
+- Webserver utilize Component Iterator to not overload eventstream :esphomepr:`3310` by :ghuser:`jesserockz`
+- Reserve less memory for json :esphomepr:`3289` by :ghuser:`jesserockz`
+- Add small delay before setting up app in safe mode :esphomepr:`3323` by :ghuser:`jesserockz`
 
 Full list of changes
 --------------------

From 40ee52c6ff23fcec915403724617d4ad08fb1dc8 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Wed, 23 Mar 2022 12:27:22 +1300
Subject: [PATCH 3/3] Update supporters for 2022.3.1

---
 guides/supporters.rst | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/guides/supporters.rst b/guides/supporters.rst
index 80cb6e485..2b9ac45df 100644
--- a/guides/supporters.rst
+++ b/guides/supporters.rst
@@ -308,7 +308,6 @@ Contributors
 - `Jimmy Hedman (@HeMan) <https://github.com/HeMan>`__
 - `HepoH3 (@HepoH3) <https://github.com/HepoH3>`__
 - `Hermann Kraus (@herm) <https://github.com/herm>`__
-- `Tom Cassady (@heytcass) <https://github.com/heytcass>`__
 - `Hamish Moffatt (@hmoffatt) <https://github.com/hmoffatt>`__
 - `Sebastian Raff (@hobbyquaker) <https://github.com/hobbyquaker>`__
 - `MoA (@honomoa) <https://github.com/honomoa>`__
@@ -329,6 +328,7 @@ Contributors
 - `imgbot[bot] (@imgbot[bot]) <https://github.com/imgbot[bot]>`__
 - `ImSorryButWho (@ImSorryButWho) <https://github.com/ImSorryButWho>`__
 - `Lorenzo Ortiz (@Infinitte) <https://github.com/Infinitte>`__
+- `Samir El Benna (@ingbenna) <https://github.com/ingbenna>`__
 - `irtimaled (@irtimaled) <https://github.com/irtimaled>`__
 - `Ivan Shvedunov (@ivan4th) <https://github.com/ivan4th>`__
 - `Ivan Kravets (@ivankravets) <https://github.com/ivankravets>`__
@@ -719,7 +719,6 @@ Contributors
 - `testbughub (@testbughub) <https://github.com/testbughub>`__
 - `Greg Lincoln (@tetious) <https://github.com/tetious>`__
 - `Thane Gill (@thanegill) <https://github.com/thanegill>`__
-- `The Impaler (@the-impaler) <https://github.com/the-impaler>`__
 - `Nejc (@thedexboy) <https://github.com/thedexboy>`__
 - `Thomas Eckerstorfer (@TheEggi) <https://github.com/TheEggi>`__
 - `TheGroundZero (@TheGroundZero) <https://github.com/TheGroundZero>`__
@@ -731,7 +730,6 @@ Contributors
 - `Dominik Bruhn (@theomega) <https://github.com/theomega>`__
 - `Simon (@theOzzieRat) <https://github.com/theOzzieRat>`__
 - `Florian Gareis (@TheZoker) <https://github.com/TheZoker>`__
-- `Thomas Hollstegge (@Tho85) <https://github.com/Tho85>`__
 - `Thomas Klingbeil (@thomasklingbeil) <https://github.com/thomasklingbeil>`__
 - `Thomas Dietrich (@ThomDietrich) <https://github.com/ThomDietrich>`__
 - `Andrew Thompson (@thompsa) <https://github.com/thompsa>`__
@@ -793,6 +791,7 @@ Contributors
 - `Rick van Hattem (@WoLpH) <https://github.com/WoLpH>`__
 - `workingmanrob (@workingmanrob) <https://github.com/workingmanrob>`__
 - `Wojtek Strzalka (@wstrzalka) <https://github.com/wstrzalka>`__
+- `wysiwyng (@wysiwyng) <https://github.com/wysiwyng>`__
 - `Mike (@xsnoopy) <https://github.com/xsnoopy>`__
 - `Yaroslav (@Yarikx) <https://github.com/Yarikx>`__
 - `Marcin Jaworski (@yawor) <https://github.com/yawor>`__
@@ -809,4 +808,4 @@ Contributors
 - `Michael Labuschke (@zigman79) <https://github.com/zigman79>`__
 - `Christian Zufferey (@zuzu59) <https://github.com/zuzu59>`__
 
-*This page was last updated March 16, 2022.*
+*This page was last updated March 23, 2022.*