smbd: Rename lck1->lock in brl_conflict_other
[samba.git] / ctdb / tests / tool / stubby.nodestatus.003.sh
2013-11-13 Stefan MetzmacherMerge branch 'master' of ctdb into 'master' of samba
2012-04-25 Ronnie SahlbergMerge remote branch 'amitay/tdb-sync'
2012-04-25 Ronnie SahlbergMerge remote branch 'amitay/tevent-sync'
2012-04-25 Ronnie SahlbergMerge remote branch 'amitay/talloc-sync'
2012-04-18 Ronnie SahlbergMerge remote branch 'martins/master'
2012-04-16 Martin Schwenketests/tool - Restructure according to new convention