From: Sage Weil <sage@redhat.com>
Date: Mon, 27 Oct 2014 19:44:34 +0000 (-0700)
Subject: Merge branch 'wip-da-SCA-20141025'
X-Git-Tag: v0.88~22
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=64d3b14f7c13d2ff561667cb064026014fb3160b;p=ceph.git

Merge branch 'wip-da-SCA-20141025'

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

64d3b14f7c13d2ff561667cb064026014fb3160b