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

Whamcloud - gitweb

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

author	ericm <ericm>
	Mon, 27 Feb 2006 20:53:36 +0000 (20:53 +0000)
committer	ericm <ericm>
	Mon, 27 Feb 2006 20:53:36 +0000 (20:53 +0000)
commit	e5e79bcf9417568dc1ba471b38a82650bef6e0d2
tree	e7f6852e9254e0724e1092154624559a3b971fb1	tree \| snapshot
parent	b948edeffd40a6ef0cfd24308d7df528e8faa1e2	commit \| diff

branch: b1_5
fix massive confliction during merge from b1_4.

67 files changed:

lustre/include/linux/lustre_user.h		diff \| blob \| history
lustre/include/lprocfs_status.h		diff \| blob \| history
lustre/include/lustre/lustre_user.h		diff \| blob \| history
lustre/include/lustre_cfg.h		diff \| blob \| history
lustre/include/lustre_dlm.h		diff \| blob \| history
lustre/include/lustre_export.h		diff \| blob \| history
lustre/include/lustre_idl.h		diff \| blob \| history
lustre/include/lustre_import.h		diff \| blob \| history
lustre/include/lustre_lib.h		diff \| blob \| history
lustre/include/lustre_lite.h		diff \| blob \| history
lustre/include/lustre_log.h		diff \| blob \| history
lustre/include/lustre_mds.h		diff \| blob \| history
lustre/include/lustre_net.h		diff \| blob \| history
lustre/include/lustre_quota.h		diff \| blob \| history
lustre/include/obd.h		diff \| blob \| history
lustre/include/obd_class.h		diff \| blob \| history
lustre/include/obd_support.h		diff \| blob \| history
lustre/ldlm/ldlm_lib.c		diff \| blob \| history
lustre/ldlm/ldlm_request.c		diff \| blob \| history
lustre/llite/dcache.c		diff \| blob \| history
lustre/llite/llite_internal.h		diff \| blob \| history
lustre/llite/llite_lib.c		diff \| blob \| history
lustre/lov/lov_ea.c		diff \| blob \| history
lustre/lov/lov_internal.h		diff \| blob \| history
lustre/lov/lov_obd.c		diff \| blob \| history
lustre/lov/lov_qos.c		diff \| blob \| history
lustre/lov/lov_request.c		diff \| blob \| history
lustre/lov/lproc_lov.c		diff \| blob \| history
lustre/mdc/mdc_internal.h		diff \| blob \| history
lustre/mdc/mdc_request.c		diff \| blob \| history
lustre/mds/handler.c		diff \| blob \| history
lustre/mds/mds_internal.h		diff \| blob \| history
lustre/mds/mds_join.c		diff \| blob \| history
lustre/mds/mds_log.c		diff \| blob \| history
lustre/mds/mds_lov.c		diff \| blob \| history
lustre/mds/mds_unlink_open.c		diff \| blob \| history
lustre/obdclass/Makefile.in		diff \| blob \| history
lustre/obdclass/class_obd.c		diff \| blob \| history
lustre/obdclass/genops.c		diff \| blob \| history
lustre/obdclass/llog.c		diff \| blob \| history
lustre/obdclass/llog_cat.c		diff \| blob \| history
lustre/obdclass/llog_ioctl.c		diff \| blob \| history
lustre/obdclass/llog_lvfs.c		diff \| blob \| history
lustre/obdclass/llog_obd.c		diff \| blob \| history
lustre/obdclass/llog_swab.c		diff \| blob \| history
lustre/obdclass/llog_test.c		diff \| blob \| history
lustre/obdclass/lustre_handles.c		diff \| blob \| history
lustre/obdclass/obd_config.c		diff \| blob \| history
lustre/obdecho/echo_client.c		diff \| blob \| history
lustre/obdfilter/filter.c		diff \| blob \| history
lustre/obdfilter/filter_internal.h		diff \| blob \| history
lustre/obdfilter/filter_log.c		diff \| blob \| history
lustre/osc/osc_create.c		diff \| blob \| history
lustre/osc/osc_request.c		diff \| blob \| history
lustre/ost/ost_handler.c		diff \| blob \| history
lustre/ptlrpc/import.c		diff \| blob \| history
lustre/ptlrpc/llog_client.c		diff \| blob \| history
lustre/ptlrpc/llog_net.c		diff \| blob \| history
lustre/ptlrpc/llog_server.c		diff \| blob \| history
lustre/ptlrpc/pack_generic.c		diff \| blob \| history
lustre/ptlrpc/pinger.c		diff \| blob \| history
lustre/ptlrpc/ptlrpcd.c		diff \| blob \| history
lustre/ptlrpc/recov_thread.c		diff \| blob \| history
lustre/ptlrpc/service.c		diff \| blob \| history
lustre/utils/lustre_cfg.c		diff \| blob \| history
lustre/utils/wirecheck.c		diff \| blob \| history
lustre/utils/wiretest.c		diff \| blob \| history

Lustre primary development and releases

RSS Atom