Merge commit 'rusty/signal-fix'

diff --combined include/ctdb_private.h
index d4c343b498a287339ac7775e21d8ecb3d01008bc,b65d1af7b3a5e9308066c559267d51fc5f696d42..cb7c165f5e663005e8cd059cfdd784bc3a58ae62
--- 1/include/ctdb_private.h
--- 2/include/ctdb_private.h
+++ b/include/ctdb_private.h
@@@ -1263,6 -1263,7 +1263,7 @@@ void ctdb_node_dead(struct ctdb_node *n
  void ctdb_node_connected(struct ctdb_node *node);
  bool ctdb_blocking_freeze(struct ctdb_context *ctdb);
  void ctdb_high_priority(struct ctdb_context *ctdb);
+ void ctdb_reduce_priority(struct ctdb_context *ctdb);
  int32_t ctdb_control_takeover_ip(struct ctdb_context *ctdb, 
                                 struct ctdb_req_control *c,
                                 TDB_DATA indata, 
@@@ -1639,7 -1640,5 +1640,7 @@@ void ctdb_fault_setup(void)
  
  int verify_remote_ip_allocation(struct ctdb_context *ctdb, 
                                struct ctdb_all_public_ips *ips);
 +int update_ip_assignment_tree(struct ctdb_context *ctdb,
 +                              struct ctdb_public_ip *ip);
  
  #endif