Merge pull request #11994 from ukernel/wip-17193

author John Spray <jspray@redhat.com>

Wed, 23 Nov 2016 18:31:54 +0000 (18:31 +0000)

committer GitHub <noreply@github.com>

Wed, 23 Nov 2016 18:31:54 +0000 (18:31 +0000)
author John Spray <jspray@redhat.com>
Wed, 23 Nov 2016 18:31:54 +0000 (18:31 +0000)
committer GitHub <noreply@github.com>
Wed, 23 Nov 2016 18:31:54 +0000 (18:31 +0000)
diff --cc src/mds/Locker.cc
Simple merge
diff --cc src/mds/MDCache.cc
Simple merge
diff --cc src/mds/SimpleLock.h
Simple merge
author	John Spray <jspray@redhat.com>
	Wed, 23 Nov 2016 18:31:54 +0000 (18:31 +0000)
committer	GitHub <noreply@github.com>
	Wed, 23 Nov 2016 18:31:54 +0000 (18:31 +0000)
		1	2
src/mds/Locker.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mds/MDCache.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mds/SimpleLock.h	patch \|	diff1 \|	diff2 \|	blob \| history