Merge PR #68710 into tentacle

* refs/pull/68710/head:
	osd: FastEC: always update pwlc epoch when activating

Reviewed-by: bcAlex Ainscow <aainscow@uk.ibm.com>

diff --cc .githubmap
index 3f7a252fe96eb0d3956ee8348de189c56462bd6e,5be50b752e76534c713ed0f465f3b28cba13feae..1c8c3a9876ef4c2f6b030248ea36e6071e73985c
--- 1/.githubmap
--- 2/.githubmap
+++ b/.githubmap
@@@ -203,8 -203,3 +203,9 @@@ asm0deuz Teoman Onay <tonay@ibm.com
  Hezko Tomer Haskalovitch <tomer.haska@ibm.com>
  caroav Aviv Caro <Aviv.Caro@ibm.com>
  Hezko Tomer Haskalovitch <tomer.haska@ibm.com>
 +baum Alexander Indenbaum <aindenba@redhat.com>
 +aainscow Alex Ainscow <aainscow@uk.ibm.com>
 +Hezko Tomer Haskalovitch <tomer.haska@ibm.com>
 +aainscow Alex Ainscow <aainscow@uk.ibm.com>
 +caroav Aviv.Caro@ibm.com
++aainscow bcAlex Ainscow <aainscow@uk.ibm.com>

diff --cc src/osd/PeeringState.cc
Simple merge