From: Sage Weil <sage@redhat.com>
Date: Mon, 2 Dec 2019 18:55:49 +0000 (-0600)
Subject: Merge PR #31348 into master
X-Git-Tag: v15.1.0~702
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=884c84d844a5aa00878113f3e6237dc33b6a1365;p=ceph.git

Merge PR #31348 into master

* refs/pull/31348/head:
	tools/rados: update advisory lock break usage with --lock-cookie required

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

884c84d844a5aa00878113f3e6237dc33b6a1365