]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge pull request #3220 from ceph/wip-mon-backports.firefly
authorLoic Dachary <ldachary@redhat.com>
Fri, 9 Jan 2015 00:28:11 +0000 (01:28 +0100)
committerLoic Dachary <ldachary@redhat.com>
Fri, 9 Jan 2015 00:28:11 +0000 (01:28 +0100)
commit4b7b1b03bfcb7cb056783555884f211009ea5d46
tree3e1fa5adfddcfeaaec423bd7f64c5562ce993da3
parent4897ba4a304bcac548b2121312cd7235c34dd5aa
parentf55b097764beb973c12866f2d7161c6bd870aa07
Merge pull request #3220 from ceph/wip-mon-backports.firefly

mon: backports for #9987 against firefly

Reviewed-by: Joao Eduardo Luis <joao@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Loic Dachary <ldachary@redhat.com>