diff options
| author | Wladimir J. van der Laan <laanwj@protonmail.com> | 2019-11-05 19:25:06 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@protonmail.com> | 2019-11-05 19:25:10 +0100 |
| commit | d35b12107e9ef16343b2ded542bbf345a753d780 (patch) | |
| tree | 7482d18f0fef1b1dc235ab97a4eb656fc8d85c61 /doc | |
| parent | 22e7eea629e27947fdd37f14b63f8349499ce4af (diff) | |
| parent | 104f7de5934f13b837fcf21f6d6b2559799eabe2 (diff) | |
Merge #17044: init: Remove auto-import of `bootstrap.dat` and associated code
104f7de5934f13b837fcf21f6d6b2559799eabe2 remove old bootstrap relevant code (tryphe)
Pull request description:
This picks up #15954
I fixed the code and added at a functional test utilizing the scripts in `contrib/linearize` as suggested by @MarcoFalke .
ACKs for top commit:
laanwj:
ACK 104f7de5934f13b837fcf21f6d6b2559799eabe2
Tree-SHA512: acac9f285f9785fcbc3afc78118461e45bec2962f90ab90e9f82f3ad28adc90a44f0443b712458ccf486e46d891eb8a67f53e7bee5fa6d89e4387814fe03f117
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/developer-notes.md | 2 | ||||
| -rw-r--r-- | doc/release-notes-15954.md | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/doc/developer-notes.md b/doc/developer-notes.md index 1756648157..e7fd8102a4 100644 --- a/doc/developer-notes.md +++ b/doc/developer-notes.md @@ -384,7 +384,7 @@ Threads - ThreadScriptCheck : Verifies block scripts. -- ThreadImport : Loads blocks from blk*.dat files or bootstrap.dat. +- ThreadImport : Loads blocks from `blk*.dat` files or `-loadblock=<file>`. - StartNode : Starts other threads. diff --git a/doc/release-notes-15954.md b/doc/release-notes-15954.md new file mode 100644 index 0000000000..f4d2c5688c --- /dev/null +++ b/doc/release-notes-15954.md @@ -0,0 +1,4 @@ +Configuration option changes +----------------------------- + +Importing blocks upon startup via the `bootstrap.dat` file no longer occurs by default. The file must now be specified with `-loadblock=<file>`. |