diff options
| author | Ronnie Sahlberg <ronniesahlberg@gmail.com> | 2011-09-12 09:34:34 +1000 |
|---|---|---|
| committer | Ronnie Sahlberg <ronniesahlberg@gmail.com> | 2011-09-12 09:34:34 +1000 |
| commit | 0dc5584101e61eeadf908d3340c2ef2fecd4cc22 (patch) | |
| tree | fbd9296e38e71309d80c9ddf9abcc58aae9d9c4e /ctdb/common/system_common.c | |
| parent | d78b0ff985c7a389ab4678fef4c2cc30cd278f42 (diff) | |
| parent | 01388c4414fcd976581f661cbe764fa0f984b293 (diff) | |
| download | samba-0dc5584101e61eeadf908d3340c2ef2fecd4cc22.tar.gz samba-0dc5584101e61eeadf908d3340c2ef2fecd4cc22.tar.xz samba-0dc5584101e61eeadf908d3340c2ef2fecd4cc22.zip | |
Merge branch 'master-readonly-records' into foo
Conflicts:
Makefile.in
tools/ctdb.c
(This used to be ctdb commit 0fedef0ffba4178126eee9544c5e2db52f5db893)
Diffstat (limited to 'ctdb/common/system_common.c')
0 files changed, 0 insertions, 0 deletions