Merge branch 'current' into next

Makefile

@@ -1,5 +1,5 @@
 ESPHOME_PATH = ../esphome
-ESPHOME_REF = 2024.6.1
+ESPHOME_REF = 2024.6.2
 PAGEFIND_VERSION=1.1.0
 PAGEFIND=pagefind
 NET_PAGEFIND=../pagefindbin/pagefind

changelog/2024.6.0.rst

@@ -112,13 +112,19 @@ You will need to change the configuration by adding a new line as below:
     # Old
     ota:
 
-    ota:
-      password: "xxxx"
-
     # New
     ota:
       platform: esphome
 
+If you have a password set, it may look like the following:
+
+.. code-block:: yaml
+
+    # Old
+    ota:
+      password: "xxxx"
+
+    # New
     ota:
       platform: esphome
       password: "xxxx"
@@ -183,6 +189,18 @@ Release 2024.6.1 - June 20
 - debug_libretiny - Fix typo :esphomepr:`6942` by :ghuser:`Cossid`
 - Bump esphome-dashboard to 20240620.0 :esphomepr:`6944` by :ghuser:`jesserockz`
 
+Release 2024.6.2 - June 25
+--------------------------
+
+- [core] Fix package merging with lists of primitives :esphomepr:`6952` by :ghuser:`jesserockz`
+- [update] Set entity_category to config & Publish state to logs :esphomepr:`6954` by :ghuser:`jesserockz`
+- Fix infinite loop in http_request for ESP-IDF. :esphomepr:`6963` by :ghuser:`kpfleming`
+- ESP-IDF 4.x expects seconds for esp_task_wdt_init(), not milliseconds. :esphomepr:`6964` by :ghuser:`kpfleming`
+- Onewire :esphomepr:`6967` by :ghuser:`ssieb`
+- [http_request] memory leak fix :esphomepr:`6973` by :ghuser:`gabest11`
+- Await cg.get_variable in Update component :esphomepr:`6974` by :ghuser:`bkaufx`
+- [one-wire] fix potential hang :esphomepr:`6976` by :ghuser:`ssieb`
+- [midea] fix fan speed compatibility with some models :esphomepr:`6978` by :ghuser:`dudanov`
 
 Full list of changes
 --------------------

guides/supporters.rst

@@ -157,6 +157,7 @@ Contributors
 - `Andrew Zaborowski (@balrog-kun) <https://github.com/balrog-kun>`__
 - `Josh Barnard (@barndawgie) <https://github.com/barndawgie>`__
 - `BarryMar (@BarryMar) <https://github.com/BarryMar>`__
+- `Bart Gysens (@BartGysens) <https://github.com/BartGysens>`__
 - `bartoszpierzchlewicz (@bartoszpierzchlewicz) <https://github.com/bartoszpierzchlewicz>`__
 - `BartoszPierzchlewiczMacrix (@BartoszPierzchlewiczMacrix) <https://github.com/BartoszPierzchlewiczMacrix>`__
 - `Bascht74 (@Bascht74) <https://github.com/Bascht74>`__
@@ -613,7 +614,6 @@ Contributors
 - `Adrián Panella (@ianchi) <https://github.com/ianchi>`__
 - `Ian Anderson (@ianderso) <https://github.com/ianderso>`__
 - `Ian Leeder (@ianleeder) <https://github.com/ianleeder>`__
-- `Jan Pobořil (@iBobik) <https://github.com/iBobik>`__
 - `icefest (@icefest) <https://github.com/icefest>`__
 - `igg (@igg) <https://github.com/igg>`__
 - `Ignacio Hernandez-Ros (@IgnacioHR) <https://github.com/IgnacioHR>`__
@@ -662,7 +662,6 @@ Contributors
 - `Josh Willox (@jcwillox) <https://github.com/jcwillox>`__
 - `JeeCee1 (@JeeCee1) <https://github.com/JeeCee1>`__
 - `jeff-h (@jeff-h) <https://github.com/jeff-h>`__
-- `Jeff Eberl (@jeffeb3) <https://github.com/jeffeb3>`__
 - `Jeff Rescignano (@JeffResc) <https://github.com/JeffResc>`__
 - `Jej (@jej) <https://github.com/jej>`__
 - `Jens-Christian Skibakk (@jenscski) <https://github.com/jenscski>`__
@@ -950,7 +949,6 @@ Contributors
 - `Nicky Ivy (@nickyivyca) <https://github.com/nickyivyca>`__
 - `NP v/d Spek (@nielsnl68) <https://github.com/nielsnl68>`__
 - `Niels Zeilemaker (@NielsZeilemaker) <https://github.com/NielsZeilemaker>`__
-- `Nigel VH (@nigelvh) <https://github.com/nigelvh>`__
 - `nikito7 (@nikito7) <https://github.com/nikito7>`__
 - `niklasweber (@niklasweber) <https://github.com/niklasweber>`__
 - `Nippey (@Nippey) <https://github.com/Nippey>`__
@@ -1098,6 +1096,7 @@ Contributors
 - `richardhopton (@richardhopton) <https://github.com/richardhopton>`__
 - `Richard Klingler (@richardklingler) <https://github.com/richardklingler>`__
 - `Richard Lewis (@richrd) <https://github.com/richrd>`__
+- `RIPPLE-CURRENT (@RIPPLE-CURRENT) <https://github.com/RIPPLE-CURRENT>`__
 - `Rishab Mehta (@rishabmehta7) <https://github.com/rishabmehta7>`__
 - `Andre Borie (@Rjevski) <https://github.com/Rjevski>`__
 - `rjlexx (@rjlexx) <https://github.com/rjlexx>`__
@@ -1201,6 +1200,7 @@ Contributors
 - `Stefan Staub (@sstaub) <https://github.com/sstaub>`__
 - `Stanislav Habich (@standahabich) <https://github.com/standahabich>`__
 - `stegm (@stegm) <https://github.com/stegm>`__
+- `Stephen Papierski (@stephenpapierski) <https://github.com/stephenpapierski>`__
 - `Steve Baxter (@stevebaxter) <https://github.com/stevebaxter>`__
 - `Steven Hack (@steven-hack) <https://github.com/steven-hack>`__
 - `Stewart (@stewiem2000) <https://github.com/stewiem2000>`__
@@ -1214,6 +1214,7 @@ Contributors
 - `sumirati (@sumirati) <https://github.com/sumirati>`__
 - `Sun Xiang yu (@sun-xiangyu) <https://github.com/sun-xiangyu>`__
 - `Penny Wood (@Swamp-Ig) <https://github.com/Swamp-Ig>`__
+- `SwedishChef (@SwedishChef) <https://github.com/SwedishChef>`__
 - `swhaat (@swhaat) <https://github.com/swhaat>`__
 - `swifty99 (@swifty99) <https://github.com/swifty99>`__
 - `Jan Gutowski (@Switch123456789) <https://github.com/Switch123456789>`__
@@ -1372,6 +1373,7 @@ Contributors
 - `Andrew Kroll (@xxxajk) <https://github.com/xxxajk>`__
 - `Yaroslav (@Yarikx) <https://github.com/Yarikx>`__
 - `Marcin Jaworski (@yawor) <https://github.com/yawor>`__
+- `Ylian Saint-Hilaire (@Ylianst) <https://github.com/Ylianst>`__
 - `yousaf465 (@yousaf465) <https://github.com/yousaf465>`__
 - `Yuval Aboulafia (@yuvalabou) <https://github.com/yuvalabou>`__
 - `Björn Stenberg (@zagor) <https://github.com/zagor>`__
@@ -1385,4 +1387,4 @@ Contributors
 - `Christian Zufferey (@zuzu59) <https://github.com/zuzu59>`__
 - `Zynth-dev (@Zynth-dev) <https://github.com/Zynth-dev>`__
 
-*This page was last updated June 20, 2024.*
+*This page was last updated June 25, 2024.*