git.decadent.org.uk Git - nfs-utils.git/commit

Merge branch 'upstream'

Conflicts:
config.guess
config.sub
configure
debian/changelog
debian/control
debian/etc.exports
debian/nfs-common.default
debian/nfs-common.dirs
debian/nfs-common.init
debian/nfs-common.install
debian/nfs-common.postinst
debian/nfs-common.postrm
debian/nfs-common.prerm
debian/nfs-kernel-server.default
debian/nfs-kernel-server.dirs
debian/nfs-kernel-server.init
debian/nfs-kernel-server.postinst
debian/nfs-kernel-server.postrm
debian/nfs-kernel-server.prerm
debian/rules
utils/gssd/Makefile
utils/svcgssd/Makefile

author	Ben Hutchings <ben@decadent.org.uk>
	Wed, 14 Jul 2010 01:29:37 +0000 (02:29 +0100)
committer	Ben Hutchings <ben@decadent.org.uk>
	Wed, 14 Jul 2010 01:29:37 +0000 (02:29 +0100)
commit	1408e610ac2db753543a546c4312b2eb6799f044
tree	4bc98aea5f95ebb956ca378b500bddab1136a24b	tree \| snapshot
parent	aa2d2da46ab7ecef2fabd8a54d75c03038fd7996	commit \| diff
parent	aa41f713fda3489d28319f3a54aef19ded933af2	commit \| diff

support/export/export.c	diff1 \|	diff2 \|	blob \| history
support/nfs/exports.c	diff1 \|	diff2 \|	blob \| history
utils/exportfs/exportfs.c	diff1 \|	diff2 \|	blob \| history
utils/exportfs/exports.man	diff1 \|	diff2 \|	blob \| history
utils/mountd/mountd.c	diff1 \|	diff2 \|	blob \| history
utils/nhfsstone/nhfsrun	diff1 \|	diff2 \|	blob \| history