]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #2231 from ceph/wip-8944-firefly
authorSage Weil <sage@inktank.com>
Wed, 13 Aug 2014 04:15:26 +0000 (21:15 -0700)
committerSage Weil <sage@inktank.com>
Wed, 13 Aug 2014 04:15:26 +0000 (21:15 -0700)
Wip 8944 firefly

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

Trivial merge