Merge branch '1.2-nodeflags' of 10.1.1.27:/shared/ctdb/ctdb-git into 1.2-nodeflags
authorRonnie Sahlberg <ronniesahlberg@gmail.com>
Fri, 8 Oct 2010 01:05:34 +0000 (12:05 +1100)
committerRonnie Sahlberg <ronniesahlberg@gmail.com>
Fri, 8 Oct 2010 01:05:34 +0000 (12:05 +1100)
commitc3055bceb74b8ad4b40c77423516c62a606cfc20
treea6fd622bd8defcc94b0bfdeb4e4420bb4892f478
parentedc4298859e6c00433ab09e0795a470199b15a37
parent3fb9556d77c5217e68b37e965363826c8068f9a4
Merge branch '1.2-nodeflags' of 10.1.1.27:/shared/ctdb/ctdb-git into 1.2-nodeflags