git.samba.org / samba.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: baa3d7e 42e477b)
Merge branch 'master' of 10.1.1.27:/shared/ctdb/ctdb-master
authorRonnie Sahlberg <ronniesahlberg@gmail.com>
Mon, 20 Feb 2012 20:12:50 +0000 (07:12 +1100)
committerRonnie Sahlberg <ronniesahlberg@gmail.com>
Mon, 20 Feb 2012 20:12:50 +0000 (07:12 +1100)
(This used to be ctdb commit 9b85aa1aa14091dc1de470a587f7c054b9e40078)

1  2 
ctdb/common/ctdb_util.c patch | diff1 | diff2 | blob | history

diff --cc ctdb/common/ctdb_util.c
Simple merge
Samba Shared Repository