Merge pull request #2699 from bitshares/release

Merge release branch into testnet branch

CONTRIBUTORS.txt

@@ -5,8 +5,8 @@ Contributors to this repository, in descending order by number of commits. Updat
 
 abitmore <abitmore@users.noreply.github.com>
 Alfredo Garcia <oxarbitrage@gmail.com>
-theoreticalbts <theoreticalbts@users.noreply.github.com>
 John M. Jones <jmjatlanta@gmail.com>
+theoreticalbts <theoreticalbts@users.noreply.github.com>
 Peter Conrad <conrad@quisquis.de>
 Daniel Larimer <bytemaster@users.noreply.github.com>
 Nathan Hourt <themodprobe@protonmail.com>
@@ -28,6 +28,7 @@ Ryan R. Fox <ryan@ryanrfox.com>
 Valentine Zavgorodnev <i@valzav.com>
 Michael Vandeberg <mvandeberg@users.noreply.github.com>
 James Calfee <james@jcalfee.info>
+ioBanker <37595908+ioBanker@users.noreply.github.com>
 Alexey Frolov <alexey.frolov@aetsoft.by>
 syalon <hanomirin@foxmail.com>
 takaaki7 <nakama67006700@gmail.com>
@@ -43,7 +44,6 @@ crazybits <crazybit.github@gmail.com>
 Anzhy Cherrnyavski <a.chernyavski@pixelplex.io>
 Tengfei Niu <spartucus@users.noreply.github.com>
 Tiago Peralta <tperalta82@gmail.com>
-ioBanker <37595908+ioBanker@users.noreply.github.com>
 xiao93 <42384581+xiao93@users.noreply.github.com>
 Karl Semich <0xloem@gmail.com>
 SahkanDesertHawk <panasiuki@gmail.com>

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

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.
 

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)