merged changes from RC_1_0

2014-11-08 16:58:18 +00:00
parent 601f0dc434
commit aae56c991c
26 changed files with 1274 additions and 929 deletions
--- a/examples/client_test.cpp
+++ b/examples/client_test.cpp
@@ -1756,7 +1756,7 @@ int main(int argc, char* argv[])
 					, "%3d [%3d, %d] %s%s\n"
 					, bucket, i->num_nodes, i->num_replacements
 					, progress_bar + (128 - i->num_nodes)
-					, "--------" + (8 - i->num_replacements));
+					, "--------" + (8 - (std::min)(8, i->num_replacements)));
 				out += str;
 			}