Merge pull request #11378 from ryneli/watch_notify_add_timeout

librados: add timeout to watch/notify

Reviewed-by: Kefu Chai <kchai@redhat.com>

diff --cc src/include/rados/librados.h
Simple merge

diff --cc src/include/rados/librados.hpp
Simple merge

diff --cc src/librados/IoCtxImpl.cc
Simple merge

diff --cc src/librados/IoCtxImpl.h
Simple merge

diff --cc src/librados/librados.cc
Simple merge

diff --cc src/osd/ReplicatedPG.cc
Simple merge

diff --cc src/tracing/librados.tp
Simple merge