]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #2948 from ceph/wip-promote
authorSage Weil <sage@redhat.com>
Sun, 11 Jan 2015 15:55:08 +0000 (07:55 -0800)
committerSage Weil <sage@redhat.com>
Sun, 11 Jan 2015 15:55:08 +0000 (07:55 -0800)
osd: promote_object separation; proxy read

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

Trivial merge