ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-12-06 17:27:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge master (0.90.1) into develop (1.0.0-b2):

Browse Source 
The merge also updates the RELEASENOTES.md with the release
notes for the 0.90.1 which were accidentally not included
in that release.
This commit is contained in:
Nikolaos D. Bougalis
2018-03-23 16:21:35 -07:00
parent 881cd4cfad 067dbf299c
commit 2b8893dfca
49 changed files with 437 additions and 283 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ripple/overlay/impl/OverlayImpl.cpp
View File

@@ -424,7 +424,7 @@ OverlayImpl::add_active (std::shared_ptr<PeerImp> const& peer)
"activated " << peer->getRemoteAddress() <<
" (" << peer->id() << ":" <<
toBase58 (
TokenType::TOKEN_NODE_PUBLIC,
TokenType::NodePublic,
peer->getNodePublic()) << ")";
// As we are not on the strand, run() must be called
@@ -610,7 +610,7 @@ OverlayImpl::activate (std::shared_ptr<PeerImp> const& peer)
"activated " << peer->getRemoteAddress() <<
" (" << peer->id() <<
":" << toBase58 (
TokenType::TOKEN_NODE_PUBLIC,
TokenType::NodePublic,
peer->getNodePublic()) << ")";
// We just accepted this peer so we have non-zero active peers