Resolve conflict

Signed-off-by: pranikum <109206473+pranikum@users.noreply.github.com>
opensearch-project · Oct 25, 2022 · 122b16c · 122b16c
1 parent 97c93c1
commit 122b16c
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -42,7 +42,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 - Add dev help in gradle check CI failures ([4872](https://github.com/opensearch-project/OpenSearch/pull/4872))
 - Copy `build.sh` over from opensearch-build ([#4887](https://github.com/opensearch-project/OpenSearch/pull/4887))
 - Add project health badges to the README.md ([#4843](https://github.com/opensearch-project/OpenSearch/pull/4843))
-
+- Added changes for graceful node decommission ([#4586](https://github.com/opensearch-project/OpenSearch/pull/4586))
 ### Dependencies
 - Bumps `log4j-core` from 2.18.0 to 2.19.0
 - Bumps `reactor-netty-http` from 1.0.18 to 1.0.23