]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge branch 'next'
authorSage Weil <sage@inktank.com>
Thu, 21 Feb 2013 18:44:04 +0000 (10:44 -0800)
committerSage Weil <sage@inktank.com>
Thu, 21 Feb 2013 18:44:04 +0000 (10:44 -0800)
commitc8d0889df59d31656c84f29d0bfa56a6ca14bf32
tree7d7458f73651b53a9972851fb488370aaf4e8eb2
parent5551aa5b3b5c2e9e7006476b9cd8cc181d2c9a04
parent6d8dfb18feb4ce263453039fc0afdb1462279e9a
Merge branch 'next'

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