Add changelog

(cherry picked from commit 76006d5) # Conflicts: # CHANGELOG.md
osmosis-labs · Jun 3, 2024 · 016c96c · 016c96c
1 parent 752d683
commit 016c96c
Show file tree

Hide file tree

Showing 2 changed files with 347 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,11 +4,17 @@
 
 * [#83](https://github.com/osmosis-labs/cometbft/pull/83)  perf(types): 3x speedup MakePartSet (#3117)
 <<<<<<< HEAD
+<<<<<<< HEAD
 * [#84](https://github.com/osmosis-labs/cometbft/pull/84)  Comment out expensive debug logs
 =======
 * [#85](https://github.com/osmosis-labs/cometbft/pull/85)  perf(flowrate): Speedup flowrate.Clock (#3016)
 >>>>>>> 8a9233c08 (Add changelog)
 
+=======
+* [#85](https://github.com/osmosis-labs/cometbft/pull/85)  perf(flowrate): Speedup flowrate.Clock (#3016)
+* [#86](https://github.com/osmosis-labs/cometbft/pull/86)  Comment out expensive debug logs
+* [#91](https://github.com/osmosis-labs/cometbft/pull/91)  perf(consensus): Minor improvement by making add vote only do one peer set mutex call, not 3 (#3156)
+>>>>>>> 76006d581 (Add changelog)
 
 ## v0.37.4-v25-osmo-5