From: MORITA Kazutaka <morita.kazutaka at lab.ntt.co.jp> v2: - Rebased onto master. - Updated test/functional/*.out since 'collie node list' doesn't show a master column. MORITA Kazutaka (14): remove wrong comments about early_log_init collie: remove unnecessary abort collie: remove redundant "\n" from the help message collie: remove master column from node list collie: don't use a negative value for a zone id corosync: show better error messages make file local variables static collie: specify void if there is no argument net: skip memset for IPv6 in str_to_addr() collie: use byte array for sdhost simplify addr_to_str with thread local storage sheep: make node_to_str and lnode_to_str thread-safe bitops: simplify fls with gcc builtin functions sha1: force inline rol() collie/cluster.c | 6 +- collie/collie.c | 10 +-- collie/collie.h | 8 +-- collie/common.c | 12 ++-- collie/farm/farm.c | 2 +- collie/farm/object_tree.c | 2 +- collie/node.c | 54 +++++---------- collie/vdi.c | 60 +++++++--------- include/bitops.h | 90 +++--------------------- include/net.h | 7 +- include/sheep.h | 7 +- include/sheepdog_proto.h | 2 +- lib/logger.c | 2 +- lib/net.c | 12 ++-- lib/sha1.c | 2 +- lib/sockfd_cache.c | 31 +++------ sheep/cluster/corosync.c | 6 +- sheep/cluster/local.c | 6 +- sheep/group.c | 6 +- sheep/recovery.c | 10 ++- sheep/sheep.c | 4 -- shepherd/shepherd.c | 4 -- tests/functional/011.out | 24 +++---- tests/functional/012.out | 10 +-- tests/functional/036.out | 144 +++++++++++++++++++-------------------- tests/functional/037.out | 144 +++++++++++++++++++-------------------- tests/functional/038.out | 144 +++++++++++++++++++-------------------- tests/functional/042.out | 40 +++++------ tests/functional/048.out | 6 +- tests/functional/063.out | 22 +++--- tests/functional/064.out | 30 ++++---- tests/functional/067.out | 20 +++--- tests/unit/collie/mock_collie.c | 2 +- 33 files changed, 402 insertions(+), 527 deletions(-) -- 1.7.9.5 |