diff options
| author | Ronnie Sahlberg <ronniesahlberg@gmail.com> | 2012-02-21 07:12:50 +1100 |
|---|---|---|
| committer | Ronnie Sahlberg <ronniesahlberg@gmail.com> | 2012-02-21 07:12:50 +1100 |
| commit | 574b47e23fd141e96357cc596fe215f7f5c5007b (patch) | |
| tree | 040d6e270683ae2a5298986c53e8fb2cd23a2ed5 /ctdb/common/ctdb_util.c | |
| parent | baa3d7ea39c9b8225fd041e30745db1e1e683534 (diff) | |
| parent | 42e477b14e0c690be28115825ac61f890e84d1c4 (diff) | |
| download | samba-574b47e23fd141e96357cc596fe215f7f5c5007b.tar.gz samba-574b47e23fd141e96357cc596fe215f7f5c5007b.tar.xz samba-574b47e23fd141e96357cc596fe215f7f5c5007b.zip | |
Merge branch 'master' of 10.1.1.27:/shared/ctdb/ctdb-master
(This used to be ctdb commit 9b85aa1aa14091dc1de470a587f7c054b9e40078)
Diffstat (limited to 'ctdb/common/ctdb_util.c')
| -rw-r--r-- | ctdb/common/ctdb_util.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ctdb/common/ctdb_util.c b/ctdb/common/ctdb_util.c index bb32b6a345..dadaf18f1e 100644 --- a/ctdb/common/ctdb_util.c +++ b/ctdb/common/ctdb_util.c @@ -346,6 +346,7 @@ pid_t ctdb_fork(struct ctdb_context *ctdb) if (ctdb->do_setsched) { ctdb_restore_scheduler(ctdb); } + ctdb->can_send_controls = false; } return pid; } |