git://git.whamcloud.com - fs/lustre-release.git/commit

Whamcloud - gitweb

git://git.whamcloud.com / fs / lustre-release.git / commit

author	rread <rread>
	Thu, 5 Jun 2003 04:12:57 +0000 (04:12 +0000)
committer	rread <rread>
	Thu, 5 Jun 2003 04:12:57 +0000 (04:12 +0000)
commit	80f0fe98e7fed340a16c80ceffde3524258b7d58
tree	b1f8d2c0d80d706d1a6c86d4711a1943fa428884	tree \| snapshot
parent	427fe5e48809886fc8b9e09e377a0bb287c686de	commit \| diff

merge from b_devel -> b_ad
DEVEL_AD_PARENT_20030526 -> DEVEL_AD_PARENT_20030605

Large, squirrelly merge. It mounts, and acceptance_small.sh finishes
the test and then fails in cleanup, just like b_devel.

39 files changed:

lnet/Makefile.am		diff \| blob \| history
lnet/archdep.m4		diff \| blob \| history
lnet/doc/ieee.bst		diff \| blob \| history
lnet/doc/portals3.lyx		diff \| blob \| history
lnet/include/linux/kp30.h		diff \| blob \| history
lnet/include/lnet/defines.h		diff \| blob \| history
lnet/include/lnet/internal.h		diff \| blob \| history
lnet/include/lnet/lib-lnet.h		diff \| blob \| history
lnet/include/lnet/lib-p30.h		diff \| blob \| history
lnet/include/lnet/list.h		diff \| blob \| history
lnet/include/lnet/myrnal.h		diff \| blob \| history
lnet/include/lnet/nal.h		diff \| blob \| history
lnet/include/lnet/ppid.h		diff \| blob \| history
lnet/include/lnet/stringtab.h		diff \| blob \| history
lnet/klnds/Makefile.am		diff \| blob \| history
lnet/klnds/socklnd/socklnd.h		diff \| blob \| history
lnet/klnds/socklnd/socklnd_cb.c		diff \| blob \| history
lnet/libcfs/debug.c		diff \| blob \| history
lnet/libcfs/module.c		diff \| blob \| history
lnet/ulnds/Makefile.am		diff \| blob \| history
lnet/ulnds/socklnd/Makefile.am		diff \| blob \| history
lustre/portals/Makefile.am		diff \| blob \| history
lustre/portals/archdep.m4		diff \| blob \| history
lustre/portals/doc/ieee.bst		diff \| blob \| history
lustre/portals/doc/portals3.lyx		diff \| blob \| history
lustre/portals/include/linux/kp30.h		diff \| blob \| history
lustre/portals/include/portals/defines.h		diff \| blob \| history
lustre/portals/include/portals/lib-p30.h		diff \| blob \| history
lustre/portals/include/portals/list.h		diff \| blob \| history
lustre/portals/include/portals/myrnal.h		diff \| blob \| history
lustre/portals/include/portals/nal.h		diff \| blob \| history
lustre/portals/include/portals/ppid.h		diff \| blob \| history
lustre/portals/include/portals/stringtab.h		diff \| blob \| history
lustre/portals/knals/Makefile.am		diff \| blob \| history
lustre/portals/knals/socknal/socknal.h		diff \| blob \| history
lustre/portals/knals/socknal/socknal_cb.c		diff \| blob \| history
lustre/portals/libcfs/debug.c		diff \| blob \| history
lustre/portals/libcfs/module.c		diff \| blob \| history
lustre/portals/unals/Makefile.am		diff \| blob \| history

Lustre primary development and releases

RSS Atom