Merge pull request #13647 from mslovy/wip-19083-jewel

author Nathan Cutler <presnypreklad@gmail.com>

Wed, 3 May 2017 08:30:32 +0000 (10:30 +0200)

committer GitHub <noreply@github.com>

Wed, 3 May 2017 08:30:32 +0000 (10:30 +0200)
author Nathan Cutler <presnypreklad@gmail.com>
Wed, 3 May 2017 08:30:32 +0000 (10:30 +0200)
committer GitHub <noreply@github.com>
Wed, 3 May 2017 08:30:32 +0000 (10:30 +0200)
diff --cc src/os/filestore/FileStore.cc
Simple merge
diff --cc src/osd/ReplicatedBackend.cc
Simple merge
diff --cc src/osd/ReplicatedPG.cc
Simple merge
diff --cc src/osd/osd_types.cc
Simple merge
diff --cc src/osd/osd_types.h
Simple merge
author	Nathan Cutler <presnypreklad@gmail.com>
	Wed, 3 May 2017 08:30:32 +0000 (10:30 +0200)
committer	GitHub <noreply@github.com>
	Wed, 3 May 2017 08:30:32 +0000 (10:30 +0200)
		1	2
src/os/filestore/FileStore.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/ReplicatedBackend.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/ReplicatedPG.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/osd_types.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/osd_types.h	patch \|	diff1 \|	diff2 \|	blob \| history