Merge pull request #2396 from ceph/wip-SCA-20140902

author Loic Dachary <loic@dachary.org>

Sat, 6 Sep 2014 20:51:13 +0000 (22:51 +0200)

committer Loic Dachary <loic@dachary.org>

Sat, 6 Sep 2014 20:51:13 +0000 (22:51 +0200)
author Loic Dachary <loic@dachary.org>
Sat, 6 Sep 2014 20:51:13 +0000 (22:51 +0200)
committer Loic Dachary <loic@dachary.org>
Sat, 6 Sep 2014 20:51:13 +0000 (22:51 +0200)
diff --cc src/client/Client.cc
Simple merge
diff --cc src/erasure-code/lrc/ErasureCodeLrc.cc
Simple merge
diff --cc src/os/FileStore.cc
Simple merge
diff --cc src/osd/ReplicatedPG.cc
Simple merge
author	Loic Dachary <loic@dachary.org>
	Sat, 6 Sep 2014 20:51:13 +0000 (22:51 +0200)
committer	Loic Dachary <loic@dachary.org>
	Sat, 6 Sep 2014 20:51:13 +0000 (22:51 +0200)
		1	2
src/client/Client.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/erasure-code/lrc/ErasureCodeLrc.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/os/FileStore.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/ReplicatedPG.cc	patch \|	diff1 \|	diff2 \|	blob \| history