Merge commit 45b6070832 used butchered version of storage_proxy patch to adjust to rpc timer change instead the one I've sent. This patch fixes the differences. Message-Id: <20170206095237.GA7691@scylladb.com> (cherry picked from commit 3c372525ed)
45b6070832
3c372525ed