]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'wip_4860' into next
authorSamuel Just <sam.just@inktank.com>
Mon, 29 Apr 2013 22:57:26 +0000 (15:57 -0700)
committerSamuel Just <sam.just@inktank.com>
Mon, 29 Apr 2013 22:57:29 +0000 (15:57 -0700)
Reviewed-by: Sage Weil <sage@inktank.com>
Reviewed-by: David Zafman <david.zafman@inktank.com>

Trivial merge