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

Whamcloud - gitweb

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

author	Mikhal Pershin <mike.pershin@intel.com>
	Fri, 10 Nov 2017 10:18:48 +0000 (13:18 +0300)
committer	Mikhal Pershin <mike.pershin@intel.com>
	Fri, 10 Nov 2017 10:18:48 +0000 (13:18 +0300)
commit	3cbe63e72c83ba50c3553d28e2fe6bc9d18c347a
tree	bd25b9879fb311a68f3edc4ea6436c5433912587	tree \| snapshot
parent	0cfb879608e5036723337ac0f8f01336ecf6b7fd	commit \| diff
parent	f8929e6d0f3c28639763ba474f663cdfd5181268	commit \| diff

LU-3285 merge: 'dom' branch merging

Merge remote-tracking branch 'origin/dom'

Signed-off-by: Mikhal Pershin <mike.pershin@intel.com>
Change-Id: I8c20ac4f5fdae6ec7ad034fbb7f5fda656f03c8b

42 files changed:

lustre/doc/lfs-setstripe.1	diff1 \|	diff2 \|	blob \| history
lustre/include/cl_object.h	diff1 \|	diff2 \|	blob \| history
lustre/include/lustre_dlm.h	diff1 \|	diff2 \|	blob \| history
lustre/include/lustre_osc.h	diff1 \|	diff2 \|	blob \| history
lustre/include/obd.h	diff1 \|	diff2 \|	blob \| history
lustre/include/uapi/linux/lustre/lustre_idl.h	diff1 \|	diff2 \|	blob \| history
lustre/ldlm/ldlm_lib.c	diff1 \|	diff2 \|	blob \| history
lustre/ldlm/ldlm_lock.c	diff1 \|	diff2 \|	blob \| history
lustre/ldlm/ldlm_lockd.c	diff1 \|	diff2 \|	blob \| history
lustre/ldlm/ldlm_request.c	diff1 \|	diff2 \|	blob \| history
lustre/llite/llite_lib.c	diff1 \|	diff2 \|	blob \| history
lustre/llite/namei.c	diff1 \|	diff2 \|	blob \| history
lustre/lmv/lmv_obd.c	diff1 \|	diff2 \|	blob \| history
lustre/lod/lod_lov.c	diff1 \|	diff2 \|	blob \| history
lustre/lod/lod_object.c	diff1 \|	diff2 \|	blob \| history
lustre/lod/lod_qos.c	diff1 \|	diff2 \|	blob \| history
lustre/lod/lproc_lod.c	diff1 \|	diff2 \|	blob \| history
lustre/mdc/mdc_locks.c	diff1 \|	diff2 \|	blob \| history
lustre/mdc/mdc_request.c	diff1 \|	diff2 \|	blob \| history
lustre/mdt/mdt_handler.c	diff1 \|	diff2 \|	blob \| history
lustre/mdt/mdt_internal.h	diff1 \|	diff2 \|	blob \| history
lustre/mdt/mdt_mds.c	diff1 \|	diff2 \|	blob \| history
lustre/mdt/mdt_open.c	diff1 \|	diff2 \|	blob \| history
lustre/mdt/mdt_reint.c	diff1 \|	diff2 \|	blob \| history
lustre/obdclass/genops.c	diff1 \|	diff2 \|	blob \| history
lustre/obdclass/obd_config.c	diff1 \|	diff2 \|	blob \| history
lustre/ofd/lproc_ofd.c	diff1 \|	diff2 \|	blob \| history
lustre/ofd/ofd_dev.c	diff1 \|	diff2 \|	blob \| history
lustre/ofd/ofd_dlm.c	diff1 \|	diff2 \|	blob \| history
lustre/ofd/ofd_internal.h	diff1 \|	diff2 \|	blob \| history
lustre/osc/osc_page.c	diff1 \|	diff2 \|	blob \| history
lustre/osc/osc_request.c	diff1 \|	diff2 \|	blob \| history
lustre/osd-zfs/osd_object.c	diff1 \|	diff2 \|	blob \| history
lustre/ptlrpc/pack_generic.c	diff1 \|	diff2 \|	blob \| history
lustre/target/tgt_grant.c	diff1 \|	diff2 \|	blob \| history
lustre/target/tgt_handler.c	diff1 \|	diff2 \|	blob \| history
lustre/target/tgt_main.c	diff1 \|	diff2 \|	blob \| history
lustre/tests/conf-sanity.sh	diff1 \|	diff2 \|	blob \| history
lustre/tests/sanity.sh	diff1 \|	diff2 \|	blob \| history
lustre/tests/sanityn.sh	diff1 \|	diff2 \|	blob \| history
lustre/tests/test-framework.sh	diff1 \|	diff2 \|	blob \| history
lustre/utils/lfs.c	diff1 \|	diff2 \|	blob \| history

Lustre primary development and releases

RSS Atom

lustre/doc/lfs-setstripe.1	diff1 \|	diff2 \|	blob \| history
lustre/include/cl_object.h	diff1 \|	diff2 \|	blob \| history
lustre/include/lustre_dlm.h	diff1 \|	diff2 \|	blob \| history
lustre/include/lustre_osc.h	diff1 \|	diff2 \|	blob \| history
lustre/include/obd.h	diff1 \|	diff2 \|	blob \| history
lustre/include/uapi/linux/lustre/lustre_idl.h	diff1 \|	diff2 \|	blob \| history
lustre/ldlm/ldlm_lib.c	diff1 \|	diff2 \|	blob \| history
lustre/ldlm/ldlm_lock.c	diff1 \|	diff2 \|	blob \| history
lustre/ldlm/ldlm_lockd.c	diff1 \|	diff2 \|	blob \| history
lustre/ldlm/ldlm_request.c	diff1 \|	diff2 \|	blob \| history
lustre/llite/llite_lib.c	diff1 \|	diff2 \|	blob \| history
lustre/llite/namei.c	diff1 \|	diff2 \|	blob \| history
lustre/lmv/lmv_obd.c	diff1 \|	diff2 \|	blob \| history
lustre/lod/lod_lov.c	diff1 \|	diff2 \|	blob \| history
lustre/lod/lod_object.c	diff1 \|	diff2 \|	blob \| history
lustre/lod/lod_qos.c	diff1 \|	diff2 \|	blob \| history
lustre/lod/lproc_lod.c	diff1 \|	diff2 \|	blob \| history
lustre/mdc/mdc_locks.c	diff1 \|	diff2 \|	blob \| history
lustre/mdc/mdc_request.c	diff1 \|	diff2 \|	blob \| history
lustre/mdt/mdt_handler.c	diff1 \|	diff2 \|	blob \| history
lustre/mdt/mdt_internal.h	diff1 \|	diff2 \|	blob \| history
lustre/mdt/mdt_mds.c	diff1 \|	diff2 \|	blob \| history
lustre/mdt/mdt_open.c	diff1 \|	diff2 \|	blob \| history
lustre/mdt/mdt_reint.c	diff1 \|	diff2 \|	blob \| history
lustre/obdclass/genops.c	diff1 \|	diff2 \|	blob \| history
lustre/obdclass/obd_config.c	diff1 \|	diff2 \|	blob \| history
lustre/ofd/lproc_ofd.c	diff1 \|	diff2 \|	blob \| history
lustre/ofd/ofd_dev.c	diff1 \|	diff2 \|	blob \| history
lustre/ofd/ofd_dlm.c	diff1 \|	diff2 \|	blob \| history
lustre/ofd/ofd_internal.h	diff1 \|	diff2 \|	blob \| history
lustre/osc/osc_page.c	diff1 \|	diff2 \|	blob \| history
lustre/osc/osc_request.c	diff1 \|	diff2 \|	blob \| history
lustre/osd-zfs/osd_object.c	diff1 \|	diff2 \|	blob \| history
lustre/ptlrpc/pack_generic.c	diff1 \|	diff2 \|	blob \| history
lustre/target/tgt_grant.c	diff1 \|	diff2 \|	blob \| history
lustre/target/tgt_handler.c	diff1 \|	diff2 \|	blob \| history
lustre/target/tgt_main.c	diff1 \|	diff2 \|	blob \| history
lustre/tests/conf-sanity.sh	diff1 \|	diff2 \|	blob \| history
lustre/tests/sanity.sh	diff1 \|	diff2 \|	blob \| history
lustre/tests/sanityn.sh	diff1 \|	diff2 \|	blob \| history
lustre/tests/test-framework.sh	diff1 \|	diff2 \|	blob \| history
lustre/utils/lfs.c	diff1 \|	diff2 \|	blob \| history