From: Loic Dachary <ldachary@redhat.com>
Date: Tue, 10 Feb 2015 12:43:31 +0000 (+0100)
Subject: Merge pull request #3525 from qiushanggao/master
X-Git-Tag: v0.93~39^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6d91ae15539851cfcc923735d17e20d5520fd944;p=ceph.git

Merge pull request #3525 from qiushanggao/master

Fix bug: When run Test_filejournal  testcase with gtest argument, all of testcases is failed.

Reviewed-by: Loic Dachary <ldachary@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
---

6d91ae15539851cfcc923735d17e20d5520fd944