Merge PR #23467 into master

author Patrick Donnelly <pdonnell@redhat.com>

Mon, 20 Aug 2018 22:11:31 +0000 (15:11 -0700)

committer Patrick Donnelly <pdonnell@redhat.com>

Mon, 20 Aug 2018 22:11:31 +0000 (15:11 -0700)
author Patrick Donnelly <pdonnell@redhat.com>
Mon, 20 Aug 2018 22:11:31 +0000 (15:11 -0700)
committer Patrick Donnelly <pdonnell@redhat.com>
Mon, 20 Aug 2018 22:11:31 +0000 (15:11 -0700)
diff --cc src/mds/PurgeQueue.cc
Simple merge
diff --cc src/mds/PurgeQueue.h
Simple merge
diff --cc src/mds/StrayManager.cc
Simple merge
diff --cc src/tools/cephfs/JournalScanner.cc
Simple merge
diff --cc src/tools/cephfs/JournalTool.cc
Simple merge
author	Patrick Donnelly <pdonnell@redhat.com>
	Mon, 20 Aug 2018 22:11:31 +0000 (15:11 -0700)
committer	Patrick Donnelly <pdonnell@redhat.com>
	Mon, 20 Aug 2018 22:11:31 +0000 (15:11 -0700)
		1	2
src/mds/PurgeQueue.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mds/PurgeQueue.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/mds/StrayManager.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/tools/cephfs/JournalScanner.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/tools/cephfs/JournalTool.cc	patch \|	diff1 \|	diff2 \|	blob \| history