Merge pull request #13704 from batrick/mds-counter-unify

author John Spray <jspray@redhat.com>

Tue, 7 Mar 2017 19:50:11 +0000 (19:50 +0000)

committer GitHub <noreply@github.com>

Tue, 7 Mar 2017 19:50:11 +0000 (19:50 +0000)
author John Spray <jspray@redhat.com>
Tue, 7 Mar 2017 19:50:11 +0000 (19:50 +0000)
committer GitHub <noreply@github.com>
Tue, 7 Mar 2017 19:50:11 +0000 (19:50 +0000)
diff --cc src/mds/CInode.cc
Simple merge
diff --cc src/mds/MDCache.cc
Simple merge
author	John Spray <jspray@redhat.com>
	Tue, 7 Mar 2017 19:50:11 +0000 (19:50 +0000)
committer	GitHub <noreply@github.com>
	Tue, 7 Mar 2017 19:50:11 +0000 (19:50 +0000)
		1	2
src/mds/CInode.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mds/MDCache.cc	patch \|	diff1 \|	diff2 \|	blob \| history