Merge branch 'master' into thane/7655-vote-extensions

This commit is contained in:
Thane Thomson
2022-04-13 19:05:05 -04:00
committed by GitHub
7 changed files with 87 additions and 62 deletions
+7 -3
View File
@@ -131,9 +131,13 @@ var plan = transform.Plan{
ErrorOK: true,
},
{
// Since https://github.com/tendermint/tendermint/pull/6396.
Desc: "Remove vestigial mempool.wal-dir setting",
T: transform.Remove(parser.Key{"mempool", "wal-dir"}),
// Removed wal-dir: https://github.com/tendermint/tendermint/pull/6396.
// Removed version: https://github.com/tendermint/tendermint/pull/7171.
Desc: "Remove vestigial mempool.wal-dir settings",
T: transform.Remove(
parser.Key{"mempool", "wal-dir"},
parser.Key{"mempool", "version"},
),
ErrorOK: true,
},
{