]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'gh/wip-2525'
authorSage Weil <sage@inktank.com>
Tue, 25 Sep 2012 19:39:03 +0000 (12:39 -0700)
committerSage Weil <sage@inktank.com>
Tue, 25 Sep 2012 19:39:03 +0000 (12:39 -0700)
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>

Trivial merge