From: Sage Weil <sage@redhat.com>
Date: Tue, 5 Aug 2014 16:15:34 +0000 (-0700)
Subject: Merge branch 'master' of github.com:ceph/ceph
X-Git-Tag: v0.85~95
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3876da15b69cb7076e808f176f38dc72e372e754;p=ceph.git

Merge branch 'master' of github.com:ceph/ceph
---

3876da15b69cb7076e808f176f38dc72e372e754