diff options
| author | Sage Weil <sage@newdream.net> | 2010-12-11 08:09:17 -0800 |
|---|---|---|
| committer | Sage Weil <sage@newdream.net> | 2010-12-11 08:09:17 -0800 |
| commit | 239b7677e7a9df86d35cbfb25226c3f1a06771c5 (patch) | |
| tree | 661a7e07bb20b5e5e2cfab53386bd08123485bac /src/tools/ceph.cc | |
| parent | 46242586eddcc948f71260f8c1ea2e8b1845a9f8 (diff) | |
| parent | 027d5bfdca196954937c1b038354ca15b5c699b7 (diff) | |
| download | ceph-239b7677e7a9df86d35cbfb25226c3f1a06771c5.tar.gz | |
Merge remote branch 'origin/syslog' into unstable
Conflicts:
src/mon/Paxos.cc
src/osd/PG.cc
Diffstat (limited to 'src/tools/ceph.cc')
| -rw-r--r-- | src/tools/ceph.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tools/ceph.cc b/src/tools/ceph.cc index 7a30e804f62..03e03caaa59 100644 --- a/src/tools/ceph.cc +++ b/src/tools/ceph.cc @@ -68,7 +68,7 @@ Context *resend_event = 0; #include "mon/PGMap.h" #include "osd/OSDMap.h" #include "mds/MDSMap.h" -#include "include/LogEntry.h" +#include "common/LogEntry.h" #include "include/ClassLibrary.h" #include "mon/mon_types.h" |