]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'wip-mshec-r44' of git://github.com/t-miyamae/ceph into hammer
authorSage Weil <sage@redhat.com>
Mon, 9 Feb 2015 05:57:14 +0000 (21:57 -0800)
committerSage Weil <sage@redhat.com>
Mon, 9 Feb 2015 05:57:14 +0000 (21:57 -0800)
Reviewed-by: Loic Dachary <ldachary@redhat.com>

Trivial merge