Whamcloud - gitweb
LU-9771 flr: Merge branch 'flr' 50/30250/2
authorJinshan Xiong <jinshan.xiong@intel.com>
Tue, 28 Nov 2017 16:56:24 +0000 (16:56 +0000)
committerJinshan Xiong <jinshan.xiong@intel.com>
Tue, 28 Nov 2017 16:58:54 +0000 (16:58 +0000)
commit2f8866e542f2cef1bbca310e00c1ece3a7268884
treede5bc92214ff79ec9f1a4e8e65a7ea5f8026338b
parenteec4b8985f5eaacd13f0e0db7328dcdd610655bc
parent311a3bb4ca735a73afc8c9086ed4cbde85f8fcda
LU-9771 flr: Merge branch 'flr'

Merge remote-tracking branch 'origin/flr'.

Signed-off-by: Jinshan Xiong <jinshan.xiong@intel.com>
Change-Id: Idee9297fbcab2bea3bd5987c94e4b4e79c49b3b6
15 files changed:
lustre/include/uapi/linux/lustre/lustre_user.h
lustre/llite/file.c
lustre/lod/lod_object.c
lustre/mdc/mdc_lib.c
lustre/mdt/mdt_handler.c
lustre/mdt/mdt_internal.h
lustre/osc/osc_request.c
lustre/tests/conf-sanity.sh
lustre/tests/sanity-hsm.sh
lustre/tests/sanity.sh
lustre/tests/test-framework.sh
lustre/utils/Makefile.am
lustre/utils/lfs.c
lustre/utils/liblustreapi.c
lustre/utils/wiretest.c