Merge pull request #7068 from ukernel/wip-14146

author John Spray <jspray@redhat.com>

Mon, 11 Jan 2016 23:14:03 +0000 (23:14 +0000)

committer John Spray <jspray@redhat.com>

Mon, 11 Jan 2016 23:14:03 +0000 (23:14 +0000)
author John Spray <jspray@redhat.com>
Mon, 11 Jan 2016 23:14:03 +0000 (23:14 +0000)
committer John Spray <jspray@redhat.com>
Mon, 11 Jan 2016 23:14:03 +0000 (23:14 +0000)
diff --cc src/mds/MDLog.cc
Simple merge
diff --cc src/mds/MDSDaemon.cc
Simple merge
diff --cc src/mds/MDSRank.cc
Simple merge
author	John Spray <jspray@redhat.com>
	Mon, 11 Jan 2016 23:14:03 +0000 (23:14 +0000)
committer	John Spray <jspray@redhat.com>
	Mon, 11 Jan 2016 23:14:03 +0000 (23:14 +0000)
		1	2
src/mds/MDLog.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mds/MDSDaemon.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mds/MDSRank.cc	patch \|	diff1 \|	diff2 \|	blob \| history