Author: jpeach Date: 2006-06-20 07:08:38 +0000 (Tue, 20 Jun 2006) New Revision: 16408
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=16408 Log: svn merge -r16213:16214 ../../trunk svn merge -r15928:15929 ../../trunk svn merge -r15973:15974 ../../trunk svn merge -r16054:16055 ../../trunk Added: branches/tmp/jpeach-xmetrics/source/modules/vfs_default.c Modified: branches/tmp/jpeach-xmetrics/source/Makefile.in branches/tmp/jpeach-xmetrics/source/aclocal.m4 branches/tmp/jpeach-xmetrics/source/configure.in branches/tmp/jpeach-xmetrics/source/include/smb.h branches/tmp/jpeach-xmetrics/source/include/vfs.h branches/tmp/jpeach-xmetrics/source/include/vfs_macros.h branches/tmp/jpeach-xmetrics/source/modules/vfs_afsacl.c branches/tmp/jpeach-xmetrics/source/modules/vfs_audit.c branches/tmp/jpeach-xmetrics/source/modules/vfs_cap.c branches/tmp/jpeach-xmetrics/source/modules/vfs_catia.c branches/tmp/jpeach-xmetrics/source/modules/vfs_default_quota.c branches/tmp/jpeach-xmetrics/source/modules/vfs_expand_msdfs.c branches/tmp/jpeach-xmetrics/source/modules/vfs_extd_audit.c branches/tmp/jpeach-xmetrics/source/modules/vfs_fake_perms.c branches/tmp/jpeach-xmetrics/source/modules/vfs_full_audit.c branches/tmp/jpeach-xmetrics/source/modules/vfs_netatalk.c branches/tmp/jpeach-xmetrics/source/modules/vfs_readonly.c branches/tmp/jpeach-xmetrics/source/modules/vfs_recycle.c branches/tmp/jpeach-xmetrics/source/modules/vfs_shadow_copy.c branches/tmp/jpeach-xmetrics/source/smbd/vfs-wrap.c branches/tmp/jpeach-xmetrics/source/smbd/vfs.c Changeset: Sorry, the patch is too large (4442 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=16408