]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'gh/wip-rbd-bid' into stable-next
authorSage Weil <sage@inktank.com>
Thu, 26 Jul 2012 22:04:12 +0000 (15:04 -0700)
committerSage Weil <sage@inktank.com>
Thu, 26 Jul 2012 22:04:12 +0000 (15:04 -0700)

Trivial merge