Manual v1.0 backports (#9025)

automerge
2020-03-23 13:55:03 -07:00
parent 7ffaf2ad29
commit 3ab428693a
22 changed files with 232 additions and 146 deletions
--- a/multinode-demo/bootstrap-validator.sh
+++ b/multinode-demo/bootstrap-validator.sh
@@ -37,9 +37,12 @@ while [[ -n $1 ]]; do
      args+=("$1" "$2")
      shift 2
    elif [[ $1 = --limit-ledger-size ]]; then
+      args+=("$1" "$2")
+      shift 2
+    elif [[ $1 = --no-rocksdb-compaction ]]; then
      args+=("$1")
      shift
-    elif [[ $1 = --enable-rpc-get-confirmed-block ]]; then
+    elif [[ $1 = --enable-rpc-transaction-history ]]; then
      args+=("$1")
      shift
    elif [[ $1 = --skip-poh-verify ]]; then