Merge pull request #12121 from dzafman/wip-16225-min

author Samuel Just <sjust@redhat.com>

Thu, 5 Jan 2017 17:12:55 +0000 (09:12 -0800)

committer GitHub <noreply@github.com>

Thu, 5 Jan 2017 17:12:55 +0000 (09:12 -0800)
author Samuel Just <sjust@redhat.com>
Thu, 5 Jan 2017 17:12:55 +0000 (09:12 -0800)
committer GitHub <noreply@github.com>
Thu, 5 Jan 2017 17:12:55 +0000 (09:12 -0800)
diff --cc src/mds/MDS.cc
Simple merge
diff --cc src/osd/OSD.cc
Simple merge
author	Samuel Just <sjust@redhat.com>
	Thu, 5 Jan 2017 17:12:55 +0000 (09:12 -0800)
committer	GitHub <noreply@github.com>
	Thu, 5 Jan 2017 17:12:55 +0000 (09:12 -0800)
		1	2
src/mds/MDS.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history