git.samba.org - obnox/samba-ctdb.git/commit

git.samba.org / obnox / samba-ctdb.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: f7d34eb 6425326)

author	Michael Adam <obnox@samba.org>
	Fri, 9 Jan 2009 15:53:30 +0000 (16:53 +0100)
committer	Michael Adam <obnox@samba.org>
	Fri, 9 Jan 2009 15:54:58 +0000 (16:54 +0100)
commit	31be3d3868e89f3a508c1013e92d16d6b1ce8577
tree	8f8d99a3550410ce8fa3acda49a67aac9e1a2d14	tree
parent	f7d34eb3e18ae47a357726ea24f043b904f7327c	commit \| diff
parent	642532608bea788e174f15aabd13376847de106a	commit \| diff

Merge commit 'origin/v3-2-test' into v3-2-ctdb

Import Bugfixes from v3-2-test to v3-2-ctdb.

Michael

12 files changed:

source/Makefile.in	diff1 \|	diff2 \|	blob \| history
source/lib/dbwrap_util.c	diff1 \|	diff2 \|	blob \| history
source/lib/util.c	diff1 \|	diff2 \|	blob \| history
source/modules/vfs_default.c	diff1 \|	diff2 \|	blob \| history
source/nmbd/nmbd.c	diff1 \|	diff2 \|	blob \| history
source/param/loadparm.c	diff1 \|	diff2 \|	blob \| history
source/smbd/server.c	diff1 \|	diff2 \|	blob \| history
source/winbindd/winbindd.c	diff1 \|	diff2 \|	blob \| history
source/winbindd/winbindd_cache.c	diff1 \|	diff2 \|	blob \| history
source/winbindd/winbindd_cm.c	diff1 \|	diff2 \|	blob \| history
source/winbindd/winbindd_dual.c	diff1 \|	diff2 \|	blob \| history
source/winbindd/winbindd_util.c	diff1 \|	diff2 \|	blob \| history

SAMBA-CTDB repository