]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
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)
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>

Trivial merge