]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #573 from dalgaaf/fix/da-cuttlefish-fixes-and-cherry-picks
authorSage Weil <sage@inktank.com>
Sat, 7 Sep 2013 20:32:40 +0000 (13:32 -0700)
committerSage Weil <sage@inktank.com>
Sat, 7 Sep 2013 20:32:40 +0000 (13:32 -0700)
Cherry-pick some smaller changes from master to cuttlefish

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

Trivial merge