OpenAFS CVS Commit: openafs/src/viced by kenh

[cvs@GRAND.CENTRAL.ORG]

Update of /cvs/openafs/src/viced
In directory GRAND.CENTRAL.ORG:/tmp/cvs-serv25420/src/viced

Modified Files:
      Tag: rxtcp
	Makefile.in NTMakefile afsfileprocs.c callback.c fs_stats.h 
	host.c host.h viced.c viced.h viced_prototypes.h 
Added Files:
      Tag: rxtcp
	callback.h 
Log Message:
DELTA rxtcp-branch-merge-20060505
AUTHOR kenh@cmf.nrl.navy.mil

Merge in changes from the HEAD back down into the rxtcp branch.


--- DELTA config for rxtcp follows ---
rxtcp-branch-merge-20060505 openafs/src/viced/callback.h /dev/null 1.1.2.2
rxtcp-branch-merge-20060505 openafs/src/viced/Makefile.in 1.12.12.1 1.12.12.2
rxtcp-branch-merge-20060505 openafs/src/viced/NTMakefile 1.5 1.5.2.1
rxtcp-branch-merge-20060505 openafs/src/viced/afsfileprocs.c 1.95.2.2 1.95.2.3
rxtcp-branch-merge-20060505 openafs/src/viced/callback.c 1.71.2.1 1.71.2.2
rxtcp-branch-merge-20060505 openafs/src/viced/fs_stats.h 1.4.6.1 1.4.6.2
rxtcp-branch-merge-20060505 openafs/src/viced/host.c 1.69.2.1 1.69.2.2
rxtcp-branch-merge-20060505 openafs/src/viced/host.h 1.12.2.1 1.12.2.2
rxtcp-branch-merge-20060505 openafs/src/viced/viced.c 1.68.2.1 1.68.2.2
rxtcp-branch-merge-20060505 openafs/src/viced/viced.h 1.6.12.1 1.6.12.2
rxtcp-branch-merge-20060505 openafs/src/viced/viced_prototypes.h 1.7 1.7.2.1