Merge pull request #12324 from dachary/wip-18103-jewel

author John Spray <jspray@redhat.com>

Tue, 31 Jan 2017 13:10:23 +0000 (14:10 +0100)

committer GitHub <noreply@github.com>

Tue, 31 Jan 2017 13:10:23 +0000 (14:10 +0100)
author John Spray <jspray@redhat.com>
Tue, 31 Jan 2017 13:10:23 +0000 (14:10 +0100)
committer GitHub <noreply@github.com>
Tue, 31 Jan 2017 13:10:23 +0000 (14:10 +0100)
diff --cc src/mds/Locker.cc
Simple merge
diff --cc src/mds/MDCache.cc
Simple merge
author	John Spray <jspray@redhat.com>
	Tue, 31 Jan 2017 13:10:23 +0000 (14:10 +0100)
committer	GitHub <noreply@github.com>
	Tue, 31 Jan 2017 13:10:23 +0000 (14:10 +0100)
		1	2
src/mds/Locker.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mds/MDCache.cc	patch \|	diff1 \|	diff2 \|	blob \| history