From: Patrick Donnelly <pdonnell@redhat.com>
Date: Tue, 10 Jul 2018 20:24:27 +0000 (-0700)
Subject: Merge PR #22455 into master
X-Git-Tag: v14.0.1~900
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bb7fbdb96b3e0d98b32dfee4058c1413e8c353fd;p=ceph.git

Merge PR #22455 into master

* refs/pull/22455/head:
	qa/ceph-volume: add a test for put_object_versioned()
	ceph-volume-client: allow atomic updates for RADOS objects

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
---

bb7fbdb96b3e0d98b32dfee4058c1413e8c353fd