]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'gh/wip-1957'
authorSage Weil <sage@inktank.com>
Thu, 20 Sep 2012 18:54:17 +0000 (11:54 -0700)
committerSage Weil <sage@inktank.com>
Thu, 20 Sep 2012 18:54:17 +0000 (11:54 -0700)
Reviewed-by: Sage Weil <sage@inktank.com>

Trivial merge