]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge remote branch 'origin/next'
authorJosh Durgin <josh.durgin@inktank.com>
Fri, 29 Mar 2013 19:58:01 +0000 (12:58 -0700)
committerJosh Durgin <josh.durgin@inktank.com>
Fri, 29 Mar 2013 19:58:01 +0000 (12:58 -0700)
commitb504e444fc65038dfab7cc875363250287b884cc
tree484ad0923c5629193ef404939a9672b0becf75ac
parent43e451f6ee66dfb294b2a3d959f72b746836f8fa
parent95c4a81be1af193786d0483fcbe81104d3da7c40
Merge remote branch 'origin/next'
src/client/Client.cc
src/common/config_opts.h
src/include/rados/librados.h
src/osd/PG.cc
src/osd/PG.h