Merge pull request #13774 from Liuchang0812/wip-add-override-in-common-headers

author Sage Weil <sage@newdream.net>

Wed, 8 Mar 2017 15:06:16 +0000 (09:06 -0600)

committer GitHub <noreply@github.com>

Wed, 8 Mar 2017 15:06:16 +0000 (09:06 -0600)
author Sage Weil <sage@newdream.net>
Wed, 8 Mar 2017 15:06:16 +0000 (09:06 -0600)
committer GitHub <noreply@github.com>
Wed, 8 Mar 2017 15:06:16 +0000 (09:06 -0600)
diff --cc src/client/Client.h
Simple merge
diff --cc src/include/rados/librados.hpp
Simple merge
author	Sage Weil <sage@newdream.net>
	Wed, 8 Mar 2017 15:06:16 +0000 (09:06 -0600)
committer	GitHub <noreply@github.com>
	Wed, 8 Mar 2017 15:06:16 +0000 (09:06 -0600)
		1	2
src/client/Client.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/include/rados/librados.hpp	patch \|	diff1 \|	diff2 \|	blob \| history