From: Sage Weil <sage@redhat.com>
Date: Wed, 19 Dec 2018 17:45:29 +0000 (-0600)
Subject: Merge PR #25614 into master
X-Git-Tag: v14.1.0~585
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b6822c8a36b27375250e050d0373f9fd284f9a2a;p=ceph.git

Merge PR #25614 into master

* refs/pull/25614/head:
	cls/rgw: update rgw_cls_usage_log_trim_op encode version

Reviewed-by: Sage Weil <sage@redhat.com>
---

b6822c8a36b27375250e050d0373f9fd284f9a2a