diff options
| author | Ronnie Sahlberg <ronniesahlberg@gmail.com> | 2009-12-01 10:53:18 +1100 |
|---|---|---|
| committer | Ronnie Sahlberg <ronniesahlberg@gmail.com> | 2009-12-01 10:53:18 +1100 |
| commit | 569001afd058254b90e58b8e61fb01105d05acf7 (patch) | |
| tree | 70534c8fdf12b628cda97fa90fa925ddfdbce3bd /ctdb/server/ctdb_keepalive.c | |
| parent | e17fa0fdeea34446feb4ce1cbad681a8ffbd6dd8 (diff) | |
| parent | ad431c352004c0fdf4714919872cac043e1618dc (diff) | |
| download | samba-569001afd058254b90e58b8e61fb01105d05acf7.tar.gz samba-569001afd058254b90e58b8e61fb01105d05acf7.tar.xz samba-569001afd058254b90e58b8e61fb01105d05acf7.zip | |
Merge commit 'martins/status-test-2'
Conflicts:
server/eventscript.c
(This used to be ctdb commit e9b3477a5b9a2eff18f727e7d59338bfb5214793)
Diffstat (limited to 'ctdb/server/ctdb_keepalive.c')
0 files changed, 0 insertions, 0 deletions