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

Whamcloud - gitweb

* merge b_recovery into HEAD

(the midnight merge troll rides again)

13 files changed:

lustre/include/linux/lustre_ha.h		diff \| blob \| history
lustre/include/linux/lustre_lib.h		diff \| blob \| history
lustre/include/linux/lustre_net.h		diff \| blob \| history
lustre/lib/client.c		diff \| blob \| history
lustre/lov/lov_obd.c		diff \| blob \| history
lustre/mdc/mdc_request.c		diff \| blob \| history
lustre/osc/osc_request.c		diff \| blob \| history
lustre/ptlrpc/client.c		diff \| blob \| history
lustre/ptlrpc/rpc.c		diff \| blob \| history
lustre/tests/local.sh		diff \| blob \| history
lustre/tests/lov.xml	[new file with mode: 0644]	blob
lustre/utils/lconf.in		diff \| blob \| history
lustre/utils/lmc		diff \| blob \| history

Lustre primary development and releases