]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge remote-tracking branch 'gh/next'
authorSage Weil <sage@inktank.com>
Tue, 19 Jun 2012 21:29:43 +0000 (14:29 -0700)
committerSage Weil <sage@inktank.com>
Tue, 19 Jun 2012 21:29:43 +0000 (14:29 -0700)
commitc70c09f63a2c811af2f63e3d77a5876999cc214c
treee6f9ff9fabeccfb19782aedb967a8297c7f85216
parent5435a4de6f9c2c7f642f1e8fb8d300b9889d7e17
parent145d1c146b51e98b4891606a55a44d20a8e75708
Merge remote-tracking branch 'gh/next'

Conflicts:
src/osd/PG.cc
src/osd/OSD.cc