merge from tridge

diff --cc common/ctdb_client.c
Simple merge

diff --cc common/ctdb_control.c
Simple merge

diff --cc config/ctdb.sysconfig
index 91ff955ad8be5d8890c7f0d3cc348de0e3b9504e,3e569961bbb49baacf180a06f550bd63cfbeb935..df8a55fc0dbc43776c12ba03dae275da700bbe58
--- 1/config/ctdb.sysconfig
--- 2/config/ctdb.sysconfig
+++ b/config/ctdb.sysconfig
@@@ -49,8 -49,16 +49,16 @@@
  
  # what debug level to run at. Higher means more verbose
  # the default is 0
 -# CTDB_DEBUGLEVEL=0
 +# DEBUGLEVEL=0
  
+ # set any default tuning options for ctdb
+ # use CTDB_SET_XXXX=value where XXXX is the name of the tuning
+ # variable
+ # for example
+ #    CTDB_SET_TRAVERSETIMEOUT=60
+ # you can get a list of variables using "ctdb listvars"
+ 
+ 
  # any other options you might want. Run ctdbd --help for a list
  # CTDB_OPTIONS=
  

diff --cc include/ctdb_private.h
Simple merge

diff --cc tools/ctdb_control.c
Simple merge