rebase and update changelog

Signed-off-by: garyschulte <garyschulte@gmail.com>
hyperledger · May 20, 2022 · 3e69200 · 3e69200
1 parent 1138628
commit 3e69200
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 ### Bug Fixes
 - Stop backward sync if genesis block has been reached [#3869](https://github.com/hyperledger/besu/pull/3869)
+- Deprecate experimental merge flag and engine-rpc-enabled flag [#3875](https://github.com/hyperledger/besu/pull/3875)
 
 ## 22.4.1
 
@@ -12,7 +13,6 @@
 - multi-arch docker builds for amd64 and arm64 [#2954](https://github.com/hyperledger/besu/pull/2954)
 - Filter Netty native lib errors likewise the pure Java implementation [#3807](https://github.com/hyperledger/besu/pull/3807)
 - Add ropsten terminal total difficulty config [#3871](https://github.com/hyperledger/besu/pull/3871)
-- Deprecate experimental merge flag and engine-rpc-enabled flag [#3875](https://github.com/hyperledger/besu/pull/3875)
 
 ### Bug Fixes
 - Stop the BlockPropagationManager when it receives the TTD reached event [#3809](https://github.com/hyperledger/besu/pull/3809)

diff --git a/besu/src/main/java/org/hyperledger/besu/cli/BesuCommand.java b/besu/src/main/java/org/hyperledger/besu/cli/BesuCommand.java
@@ -567,7 +567,7 @@ static class GraphQlOptionGroup {
   static class EngineRPCOptionGroup {
     @Option(
         names = {"--engine-rpc-enabled"},
-        description = "deprected parameter, do not use.",
+        description = "deprectaed parameter, do not use.",
         hidden = true)
     private final Boolean deprecatedIsEngineRpcEnabled = false;