diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index c86b7126f..aaa29e509 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -5,8 +5,8 @@ Contributors to this repository, in descending order by number of commits. Updat abitmore Alfredo Garcia -theoreticalbts John M. Jones +theoreticalbts Peter Conrad Daniel Larimer Nathan Hourt @@ -28,6 +28,7 @@ Ryan R. Fox Valentine Zavgorodnev Michael Vandeberg James Calfee +ioBanker <37595908+ioBanker@users.noreply.github.com> Alexey Frolov syalon takaaki7 @@ -43,7 +44,6 @@ crazybits Anzhy Cherrnyavski Tengfei Niu Tiago Peralta -ioBanker <37595908+ioBanker@users.noreply.github.com> xiao93 <42384581+xiao93@users.noreply.github.com> Karl Semich <0xloem@gmail.com> SahkanDesertHawk diff --git a/Doxyfile b/Doxyfile index 293cad9ee..7f596caf9 100644 --- a/Doxyfile +++ b/Doxyfile @@ -38,7 +38,7 @@ PROJECT_NAME = "BitShares-Core" # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = "6.0.1" +PROJECT_NUMBER = "6.1.0" # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a diff --git a/README.md b/README.md index 6a58e923e..3cf0d69ee 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ BitShares Test Network [BitShares Core](https://github.com/bitshares/bitshares-core) is the BitShares blockchain node software and command-line wallet software. For UI reference wallet software (browser-based wallet and desktop wallet) visit [BitShares UI](https://github.com/bitshares/bitshares-ui). -Visit [BitShares.org](https://bitshares.org/) to learn about BitShares and join the community at [BitSharesTalk.org](https://bitsharestalk.org/). +Visit [BitShares.github.io](https://bitshares.github.io/) to learn about BitShares and join the community at [BitSharesTalk.org](https://bitsharestalk.org/). Information for developers can be found in the [Wiki](https://github.com/bitshares/bitshares-core/wiki) and the [BitShares Developer Portal](https://dev.bitshares.works/). Users interested in how BitShares works can go to the [BitShares Documentation](https://how.bitshares.works/) site. diff --git a/docs b/docs index 1e924950c..6f6ea4ef1 160000 --- a/docs +++ b/docs @@ -1 +1 @@ -Subproject commit 1e924950c2f92b166c34ceb294e8b8c4997a6c4e +Subproject commit 6f6ea4ef17c72bc7d5fbdab5f98d1bea364b8723 diff --git a/libraries/net/node_impl.hxx b/libraries/net/node_impl.hxx index f76aeaaad..9fa3c697c 100644 --- a/libraries/net/node_impl.hxx +++ b/libraries/net/node_impl.hxx @@ -342,10 +342,10 @@ class statistics_gathering_node_delegate_wrapper : public node_delegate (*_delay_after_accumulator)(delay_after.count()); if (total_duration > fc::milliseconds(500)) { - ilog("Call to method node_delegate::${method} took ${total_duration}us, longer than our target maximum of 500ms", + dlog("Call to method node_delegate::${method} took ${total_duration}us, longer than our target maximum of 500ms", ("method", _method_name) ("total_duration", total_duration.count())); - ilog("Actual execution took ${execution_duration}us, with a ${delegate_delay}us delay before the delegate thread started " + dlog("Actual execution took ${execution_duration}us, with a ${delegate_delay}us delay before the delegate thread started " "executing the method, and a ${p2p_delay}us delay after it finished before the p2p thread started processing the response", ("execution_duration", actual_execution_time) ("delegate_delay", delay_before)