Merge pull request #7242 from xiexingguo/xxg-wip-14370

author Sage Weil <sage@redhat.com>

Wed, 20 Jan 2016 23:15:44 +0000 (18:15 -0500)

committer Sage Weil <sage@redhat.com>

Wed, 20 Jan 2016 23:15:44 +0000 (18:15 -0500)
author Sage Weil <sage@redhat.com>
Wed, 20 Jan 2016 23:15:44 +0000 (18:15 -0500)
committer Sage Weil <sage@redhat.com>
Wed, 20 Jan 2016 23:15:44 +0000 (18:15 -0500)
diff --cc src/os/bluestore/BlueStore.cc
Simple merge
diff --cc src/os/kstore/KStore.cc
Simple merge
author	Sage Weil <sage@redhat.com>
	Wed, 20 Jan 2016 23:15:44 +0000 (18:15 -0500)
committer	Sage Weil <sage@redhat.com>
	Wed, 20 Jan 2016 23:15:44 +0000 (18:15 -0500)
		1	2
src/os/bluestore/BlueStore.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/os/kstore/KStore.cc	patch \|	diff1 \|	diff2 \|	blob \| history