tls
Thu Jan  9 07:40:01 PST 1997
Update of /a/cvsroot/src/sbin/nfsd
In directory netbsd1:/var/slash-tmp/cvs-serv10338

Log Message:
Import from 4.4BSD-Lite2

Status:

Vendor Tag:	CSRG
Release Tags:	lite-2
		
U src/sbin/nfsd/Makefile
C src/sbin/nfsd/nfsd.8
C src/sbin/nfsd/nfsd.c

2 conflicts created by this import.
Use the following command to help the merge:

	cvs checkout -jCSRG:yesterday -jCSRG src/sbin/nfsd


tls
Thu Jan  9 07:40:18 PST 1997
Update of /a/cvsroot/src/sbin/nfsiod
In directory netbsd1:/var/slash-tmp/cvs-serv10469

Log Message:
Import from 4.4BSD-Lite2

Status:

Vendor Tag:	CSRG
Release Tags:	lite-2
		
C src/sbin/nfsiod/nfsiod.c
U src/sbin/nfsiod/Makefile
U src/sbin/nfsiod/nfsiod.8

1 conflicts created by this import.
Use the following command to help the merge:

	cvs checkout -jCSRG:yesterday -jCSRG src/sbin/nfsiod


tls
Thu Jan  9 07:43:49 PST 1997
Update of /a/cvsroot/src/usr.bin/nfsstat
In directory netbsd1:/var/slash-tmp/cvs-serv11032

Log Message:
Import from 4.4BSD-Lite2

Status:

Vendor Tag:	CSRG
Release Tags:	lite-2
		
C src/usr.bin/nfsstat/nfsstat.1
C src/usr.bin/nfsstat/Makefile
C src/usr.bin/nfsstat/nfsstat.c

3 conflicts created by this import.
Use the following command to help the merge:

	cvs checkout -jCSRG:yesterday -jCSRG src/usr.bin/nfsstat