From: Jinshan Xiong <jinshan.xiong@intel.com>
Date: Tue, 28 Nov 2017 16:56:24 +0000 (+0000)
Subject: LU-9771 flr: Merge branch 'flr'
X-Git-Tag: 2.10.56~9^2
X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=2f8866e542f2cef1bbca310e00c1ece3a7268884;p=fs%2Flustre-release.git

LU-9771 flr: Merge branch 'flr'

Merge remote-tracking branch 'origin/flr'.

Signed-off-by: Jinshan Xiong <jinshan.xiong@intel.com>
Change-Id: Idee9297fbcab2bea3bd5987c94e4b4e79c49b3b6
---

2f8866e542f2cef1bbca310e00c1ece3a7268884