]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge pull request #649 from ceph/wip-6422
authorSage Weil <sage@inktank.com>
Wed, 2 Oct 2013 17:51:29 +0000 (10:51 -0700)
committerSage Weil <sage@inktank.com>
Wed, 2 Oct 2013 17:51:29 +0000 (10:51 -0700)
commit348890232d590d656162f3d7c0a85742f3cf1760
tree9add931ab9e630acd0917af37b10e8003cb905e5
parentb822373afdfe8064f7b9a91c426749662fe4f6ce
parent8835ef8f9833b250e8d09716f683893073db5306
Merge pull request #649 from ceph/wip-6422

#6422

Reviewed-by: Sage Weil <sage@inktank.com>
src/os/FileStore.cc
src/osd/OSD.cc