Merge branch 'ctdb-merge' into dmapi-integration
authorAlexander Bokovoy <ab@samba.org>
Tue, 29 Jan 2008 13:19:21 +0000 (16:19 +0300)
committerAlexander Bokovoy <ab@samba.org>
Tue, 29 Jan 2008 13:19:21 +0000 (16:19 +0300)
commitef2d66bd1d1009ab4747cb4b7fc5533d44475c02
treeaab3a8d500fa2ff1e542aef8ac9f7a7af520b8e6
parentd9a1282cc5e4a44495ec8ce20ef6dad6dc79c96b
parenteba5fbff749b84a3e1bcd1f849c3454417532454
Merge branch 'ctdb-merge' into dmapi-integration
(This used to be commit 58dce4cdf277c8c68865185d9d8b4faea996dd3e)