Merge #7741: [0.12] Mark p2p alert system as deprecated

c0fe2c9 Mark p2p alert system as deprecated. (BtcDrak)
This commit is contained in:
Wladimir J. van der Laan 2016-03-29 10:50:12 +02:00
commit a0cea89456
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6
2 changed files with 2 additions and 5 deletions

View File

@ -35,10 +35,7 @@ earlier.
Notable changes Notable changes
=============== ===============
Example item The p2p alert system is off by default. To turn on, use `-alert` with startup configuration.
---------------------------------------
Example text.
0.12.1 Change log 0.12.1 Change log
================= =================

View File

@ -41,7 +41,7 @@ class CValidationState;
struct CNodeStateStats; struct CNodeStateStats;
/** Default for accepting alerts from the P2P network. */ /** Default for accepting alerts from the P2P network. */
static const bool DEFAULT_ALERTS = true; static const bool DEFAULT_ALERTS = false;
/** Default for DEFAULT_WHITELISTRELAY. */ /** Default for DEFAULT_WHITELISTRELAY. */
static const bool DEFAULT_WHITELISTRELAY = true; static const bool DEFAULT_WHITELISTRELAY = true;
/** Default for DEFAULT_WHITELISTFORCERELAY. */ /** Default for DEFAULT_WHITELISTFORCERELAY. */