Merge pull request #6415 from dillaman/wip-13541-hammer

author Loic Dachary <loic@dachary.org>

Thu, 14 Jan 2016 07:22:35 +0000 (08:22 +0100)

committer Loic Dachary <loic@dachary.org>

Thu, 14 Jan 2016 07:22:35 +0000 (08:22 +0100)
author Loic Dachary <loic@dachary.org>
Thu, 14 Jan 2016 07:22:35 +0000 (08:22 +0100)
committer Loic Dachary <loic@dachary.org>
Thu, 14 Jan 2016 07:22:35 +0000 (08:22 +0100)
diff --cc ceph.spec.in
Simple merge
diff --cc src/os/FileStore.cc
Simple merge
author	Loic Dachary <loic@dachary.org>
	Thu, 14 Jan 2016 07:22:35 +0000 (08:22 +0100)
committer	Loic Dachary <loic@dachary.org>
	Thu, 14 Jan 2016 07:22:35 +0000 (08:22 +0100)
		1	2
ceph.spec.in	patch \|	diff1 \|	diff2 \|	blob \| history
src/os/FileStore.cc	patch \|	diff1 \|	diff2 \|	blob \| history