diff options
| author | Greg Farnum <greg@inktank.com> | 2013-02-11 22:02:33 -0800 |
|---|---|---|
| committer | Greg Farnum <greg@inktank.com> | 2013-02-11 22:02:40 -0800 |
| commit | 8864c7302769ecb7cd72c28fd7e58ccd76c290f9 (patch) | |
| tree | 487b562b8ee09409a9e78f12c1b43c342c45d744 /src/osd/OSD.h | |
| parent | f0b2e32af69d7d009837832066a1445c45bbc362 (diff) | |
| parent | 77612336a0df1910ec07af7a39a6d1825c3dce17 (diff) | |
| download | ceph-8864c7302769ecb7cd72c28fd7e58ccd76c290f9.tar.gz | |
Merge branch 'wip-mds-encode-rebased'
Reviewed-by: Sage Weil <sage@inktank.com>
Diffstat (limited to 'src/osd/OSD.h')
| -rw-r--r-- | src/osd/OSD.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/osd/OSD.h b/src/osd/OSD.h index 03d78cc1cd6..015694b8074 100644 --- a/src/osd/OSD.h +++ b/src/osd/OSD.h @@ -31,7 +31,6 @@ #include "os/ObjectStore.h" #include "OSDCap.h" -#include "common/DecayCounter.h" #include "osd/ClassHandler.h" #include "include/CompatSet.h" |