Merge pull request #11663 from stiopaa1/mds_mdslog_addConstToMemFunc

author Sage Weil <sage@redhat.com>

Fri, 28 Oct 2016 10:52:23 +0000 (05:52 -0500)

committer GitHub <noreply@github.com>

Fri, 28 Oct 2016 10:52:23 +0000 (05:52 -0500)
author Sage Weil <sage@redhat.com>
Fri, 28 Oct 2016 10:52:23 +0000 (05:52 -0500)
committer GitHub <noreply@github.com>
Fri, 28 Oct 2016 10:52:23 +0000 (05:52 -0500)
diff --cc src/mds/MDLog.cc
Simple merge
diff --cc src/mds/MDLog.h
Simple merge
author	Sage Weil <sage@redhat.com>
	Fri, 28 Oct 2016 10:52:23 +0000 (05:52 -0500)
committer	GitHub <noreply@github.com>
	Fri, 28 Oct 2016 10:52:23 +0000 (05:52 -0500)
		1	2
src/mds/MDLog.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mds/MDLog.h	patch \|	diff1 \|	diff2 \|	blob \| history