From owner-cvs-all  Tue Sep 14 22:45:23 1999
Delivered-To: cvs-all@freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21])
	by hub.freebsd.org (Postfix) with ESMTP
	id 943FB1572F; Tue, 14 Sep 1999 22:45:18 -0700 (PDT)
	(envelope-from obrien@FreeBSD.org)
Received: (from obrien@localhost)
	by freefall.freebsd.org (8.9.3/8.9.2) id WAA04131;
	Tue, 14 Sep 1999 22:45:18 -0700 (PDT)
	(envelope-from obrien@FreeBSD.org)
Message-Id: <199909150545.WAA04131@freefall.freebsd.org>
From: "David E. O'Brien" <obrien@FreeBSD.org>
Date: Tue, 14 Sep 1999 22:45:18 -0700 (PDT)
To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject: cvs commit: src/contrib/amd/amd amd.8 amd.c amq_subr.c get_args.c
         srvr_nfs.c src/contrib/amd/amq amq.8 amq.c pawd.1
         src/contrib/amd/conf/nfs_prot nfs_prot_freebsd2.h nfs_prot_freebsd3.h
         src/contrib/amd/fixmount fixmount.8 fixmount.c ...
Sender: owner-cvs-all@FreeBSD.ORG
Precedence: bulk

obrien      1999/09/14 22:45:17 PDT

  Modified files:
    contrib/amd/amd      amd.8 amd.c amq_subr.c get_args.c 
                         srvr_nfs.c 
    contrib/amd/amq      amq.8 amq.c pawd.1 
    contrib/amd/conf/nfs_prot nfs_prot_freebsd2.h 
                              nfs_prot_freebsd3.h 
    contrib/amd/fixmount fixmount.8 fixmount.c 
    contrib/amd/fsinfo   fsinfo.8 fsinfo.c 
    contrib/amd/hlfsd    hlfsd.8 hlfsd.c homedir.c 
    contrib/amd/include  am_defs.h 
    contrib/amd/libamu   mount_fs.c 
    contrib/amd/mk-amd-map mk-amd-map.8 mk-amd-map.c 
    contrib/amd/scripts  amd.conf.5 
    contrib/amd/wire-test wire-test.8 wire-test.c 
  Log:
  Fix conflicts.
  
  Revision  Changes    Path
  1.4       +3 -2      src/contrib/amd/amd/amd.8
  1.5       +5 -15     src/contrib/amd/amd/amd.c
  1.5       +5 -18     src/contrib/amd/amd/amq_subr.c
  1.4       +4 -3      src/contrib/amd/amd/get_args.c
  1.4       +11 -10    src/contrib/amd/amd/srvr_nfs.c
  1.5       +3 -2      src/contrib/amd/amq/amq.8
  1.5       +24 -20    src/contrib/amd/amq/amq.c
  1.4       +2 -1      src/contrib/amd/amq/pawd.1
  1.4       +3 -2      src/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h
  1.7       +6 -2      src/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h
  1.5       +3 -2      src/contrib/amd/fixmount/fixmount.8
  1.5       +3 -11     src/contrib/amd/fixmount/fixmount.c
  1.4       +3 -2      src/contrib/amd/fsinfo/fsinfo.8
  1.4       +3 -10     src/contrib/amd/fsinfo/fsinfo.c
  1.5       +3 -2      src/contrib/amd/hlfsd/hlfsd.8
  1.5       +10 -18    src/contrib/amd/hlfsd/hlfsd.c
  1.4       +8 -7      src/contrib/amd/hlfsd/homedir.c
  1.6       +83 -16    src/contrib/amd/include/am_defs.h
  1.3       +35 -5     src/contrib/amd/libamu/mount_fs.c
  1.3       +3 -2      src/contrib/amd/mk-amd-map/mk-amd-map.8
  1.7       +3 -12     src/contrib/amd/mk-amd-map/mk-amd-map.c
  1.9       +4 -3      src/contrib/amd/scripts/amd.conf.5
  1.3       +3 -2      src/contrib/amd/wire-test/wire-test.8
  1.5       +3 -15     src/contrib/amd/wire-test/wire-test.c



To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe cvs-all" in the body of the message