]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge remote-tracking branch 'origin/wip-7999' into firefly-next
authorSamuel Just <sam.just@inktank.com>
Sat, 2 Aug 2014 18:22:47 +0000 (11:22 -0700)
committerSamuel Just <sam.just@inktank.com>
Sat, 2 Aug 2014 18:22:47 +0000 (11:22 -0700)
commit223a0a9e7ed76fbc114c2f058d3aff93556244e9
tree17798c3627e5f48632636e88edcf0fbf9e81492c
parent84bd3cd79961d1ddce12048f9ae980fc197e6be4
parentd72eec0341e02881229d0e4ffeafcae92eb33fb6
Merge remote-tracking branch 'origin/wip-7999' into firefly-next

Backport of 830940bf242a73403ec1882a489e31f7694b7f7e
src/os/FileStore.cc
src/os/KeyValueStore.cc
src/osd/PG.cc
src/osd/PG.h