merged chagnes from RC_1_0

2014-11-01 22:47:56 +00:00
parent 8bd8426f04
commit 34af25beaa
11 changed files with 222 additions and 129 deletions
--- a/examples/client_test.cpp
+++ b/examples/client_test.cpp
@@ -1748,8 +1748,8 @@ int main(int argc, char* argv[])
 				, end(sess_stat.dht_routing_table.end()); i != end; ++i, ++bucket)
 			{
 				snprintf(str, sizeof(str)
-					, "%3d [%2d, %2d] active: %d\n"
-					, bucket, i->num_nodes, i->num_replacements, i->last_active);
+					, "%3d [%3d, %d]\n"
+					, bucket, i->num_nodes, i->num_replacements);
 				out += str;
 			}