]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'wip-objecter' into next
authorSage Weil <sage@inktank.com>
Thu, 13 Jun 2013 23:15:44 +0000 (16:15 -0700)
committerSage Weil <sage@inktank.com>
Thu, 13 Jun 2013 23:15:44 +0000 (16:15 -0700)
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>

Trivial merge