From: Samuel Just <sam.just@inktank.com>
Date: Fri, 10 Jul 2015 00:10:10 +0000 (-0700)
Subject: Merge pull request #4458 from wonzhq/dup-promote
X-Git-Tag: v9.0.3~59
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=87a185b01e15ab491902d90d3afbded64d78b01f;p=ceph.git

Merge pull request #4458 from wonzhq/dup-promote

osd/ReplicatedPG: need to queue op when avoiding dup promotion in maybe_handle_cache

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

87a185b01e15ab491902d90d3afbded64d78b01f