diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-03-29 10:50:12 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-03-29 10:52:28 +0200 |
| commit | a0cea89456f83496bd8b661f1608fb577fe6a1f2 (patch) | |
| tree | 4136eb1aafededc625a0bdb567ada15c9976a053 | |
| parent | 597494f5a90c041945006b8f3eff8f7e482e0f2f (diff) | |
| parent | c0fe2c9e0301f9b046b51fd78bb89ed8f6946eb8 (diff) | |
| download | bitcoin-a0cea89456f83496bd8b661f1608fb577fe6a1f2.tar.xz | |
Merge #7741: [0.12] Mark p2p alert system as deprecated
c0fe2c9 Mark p2p alert system as deprecated. (BtcDrak)
| -rw-r--r-- | doc/release-notes.md | 5 | ||||
| -rw-r--r-- | src/main.h | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/doc/release-notes.md b/doc/release-notes.md index 17a8984b37..177bf333bb 100644 --- a/doc/release-notes.md +++ b/doc/release-notes.md @@ -35,10 +35,7 @@ earlier. Notable changes =============== -Example item ---------------------------------------- - -Example text. +The p2p alert system is off by default. To turn on, use `-alert` with startup configuration. 0.12.1 Change log ================= diff --git a/src/main.h b/src/main.h index 9fd97d2126..c63e190706 100644 --- a/src/main.h +++ b/src/main.h @@ -41,7 +41,7 @@ class CValidationState; struct CNodeStateStats; /** Default for accepting alerts from the P2P network. */ -static const bool DEFAULT_ALERTS = true; +static const bool DEFAULT_ALERTS = false; /** Default for DEFAULT_WHITELISTRELAY. */ static const bool DEFAULT_WHITELISTRELAY = true; /** Default for DEFAULT_WHITELISTFORCERELAY. */ |