]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge branch 'next'
authorDan Mick <dan.mick@inktank.com>
Tue, 6 Nov 2012 23:52:38 +0000 (15:52 -0800)
committerDan Mick <dan.mick@inktank.com>
Tue, 6 Nov 2012 23:52:38 +0000 (15:52 -0800)
commit0c989794bde4ce74daacc29a2f2e9e3c9d1be1b2
tree3053abb75fc0ebd44fc4345d7bc0900631847903
parentfe9a441037f221ba09b01c3967f69b3626c99116
parent0baa9275ea1ec68e902c15342921477ae9db0aa4
Merge branch 'next'
src/cls/rbd/cls_rbd.cc
src/rgw/rgw_op.cc