5 commits

Author	SHA1	Message	Date
Tulir Asokan	b0f213fd3d	Merge remote-tracking branch 'upstream/release-v1.64'	2022-07-28 10:49:41 +03:00
Erik Johnston	0ca4172b5d	Don't pull out state in compute_event_context for unconflicted state (#13267)	2022-07-14 13:57:02 +00:00
Tulir Asokan	1543a3643e	Merge remote-tracking branch 'upstream/release-v1.61'	2022-06-14 13:54:26 +03:00
Erik Johnston	888a29f412	Wait for lazy join to complete when getting current state (#12872)	2022-06-01 16:02:53 +01:00
Erik Johnston	1e453053cb	Rename storage classes (#12913)	2022-05-31 12:17:50 +00:00