]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'wip_4955' into next
authorSamuel Just <sam.just@inktank.com>
Fri, 10 May 2013 05:37:37 +0000 (22:37 -0700)
committerSamuel Just <sam.just@inktank.com>
Fri, 10 May 2013 05:37:37 +0000 (22:37 -0700)
Reviewed-by: Sage Weil <sage@inktank.com>

Trivial merge