Merge pull request #28351 from trociny/wip-39968

author Jason Dillaman <dillaman@redhat.com>

Thu, 27 Jun 2019 17:41:02 +0000 (13:41 -0400)

committer GitHub <noreply@github.com>

Thu, 27 Jun 2019 17:41:02 +0000 (13:41 -0400)
author Jason Dillaman <dillaman@redhat.com>
Thu, 27 Jun 2019 17:41:02 +0000 (13:41 -0400)
committer GitHub <noreply@github.com>
Thu, 27 Jun 2019 17:41:02 +0000 (13:41 -0400)
diff --cc src/test/librados_test_stub/LibradosTestStub.cc
Simple merge
author	Jason Dillaman <dillaman@redhat.com>
	Thu, 27 Jun 2019 17:41:02 +0000 (13:41 -0400)
committer	GitHub <noreply@github.com>
	Thu, 27 Jun 2019 17:41:02 +0000 (13:41 -0400)