From: Sage Weil <sage@redhat.com>
Date: Wed, 11 Feb 2015 17:20:19 +0000 (-0800)
Subject: Merge branch 'hammer' of github.com:ceph/ceph into hammer
X-Git-Tag: v0.93~63
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1d306ad015f27fc68ff2c92eab284fb2342e413e;p=ceph.git

Merge branch 'hammer' of github.com:ceph/ceph into hammer

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

cli bits
Reviewed-by: Dan Mick <dmick@redhat.com>
---

1d306ad015f27fc68ff2c92eab284fb2342e413e