]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #926 from yuyuyu101/wip/6950
authorSage Weil <sage@inktank.com>
Wed, 18 Dec 2013 18:42:40 +0000 (10:42 -0800)
committerSage Weil <sage@inktank.com>
Wed, 18 Dec 2013 18:42:40 +0000 (10:42 -0800)
Move PerfCounter from ObjectStore.h to FileStore.h

Reviewed-by: Sage Weil <sage@inktank.com>
1  2 
src/os/FileJournal.cc

Simple merge