]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'gh/firefly'
authorSage Weil <sage@inktank.com>
Thu, 24 Apr 2014 01:00:59 +0000 (18:00 -0700)
committerSage Weil <sage@inktank.com>
Thu, 24 Apr 2014 01:00:59 +0000 (18:00 -0700)

Trivial merge