]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'gh/wip-7329' into next
authorSage Weil <sage@inktank.com>
Sun, 9 Feb 2014 18:37:47 +0000 (10:37 -0800)
committerSage Weil <sage@inktank.com>
Sun, 9 Feb 2014 18:37:47 +0000 (10:37 -0800)

Trivial merge