Merge pull request #9396 from songbaisen/doc2

author Sage Weil <sage@newdream.net>

Fri, 3 Feb 2017 22:24:59 +0000 (16:24 -0600)

committer GitHub <noreply@github.com>

Fri, 3 Feb 2017 22:24:59 +0000 (16:24 -0600)
author Sage Weil <sage@newdream.net>
Fri, 3 Feb 2017 22:24:59 +0000 (16:24 -0600)
committer GitHub <noreply@github.com>
Fri, 3 Feb 2017 22:24:59 +0000 (16:24 -0600)
diff --cc doc/rados/api/librados-intro.rst
Simple merge
author	Sage Weil <sage@newdream.net>
	Fri, 3 Feb 2017 22:24:59 +0000 (16:24 -0600)
committer	GitHub <noreply@github.com>
	Fri, 3 Feb 2017 22:24:59 +0000 (16:24 -0600)