From 666d8db598af5e8809a0fbd30b2343221aaeb40d Mon Sep 17 00:00:00 2001
From: Ryo Onodera <ryoqun@gmail.com>
Date: Wed, 26 Jun 2024 15:05:08 +0900
Subject: [PATCH] Add --block-verification-method=unified-scheduler for v2.0
 changelog (#1878)

(cherry picked from commit 2b88299585886cdad87c7b9403d2da4324dc8af0)

# Conflicts:
#	CHANGELOG.md
---
 CHANGELOG.md | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d06153cde695f3..70753122a0bb96 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -29,6 +29,16 @@ Release channels have their own copy of this changelog:
   * SDK: `cargo test-sbf` accepts `--tools-version`, just like `build-sbf` (#1359)
   * CLI: Can specify `--full-snapshot-archive-path` (#1631)
   * transaction-status: The SPL Token `amountToUiAmount` instruction parses the amount into a string instead of a number (#1737)
+<<<<<<< HEAD
+=======
+  * Implemented partitioned epoch rewards as per [SIMD-0118](https://github.com/solana-foundation/solana-improvement-documents/blob/fae25d5a950f43bd787f1f5d75897ef1fdd425a7/proposals/0118-partitioned-epoch-reward-distribution.md). Feature gate: #426. Specific changes include:
+    * EpochRewards sysvar expanded and made persistent (#428, #572)
+    * Stake Program credits now allowed during distribution (#631)
+    * Updated type in Bank::epoch_rewards_status (#1277)
+    * Partitions are recalculated on boot from snapshot (#1159)
+    * `epoch_rewards_status` removed from snapshot (#1274)
+  * Added `unified-scheduler` option for `--block-verification-method` (#1668)
+>>>>>>> 2b88299585 (Add --block-verification-method=unified-scheduler for v2.0 changelog (#1878))
 
 ## [1.18.0]
 * Changes