diff options
| author | Sage Weil <sage@inktank.com> | 2013-03-22 08:46:31 -0700 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2013-03-22 08:46:31 -0700 |
| commit | a35b8650931b441621c130c85e30cb6f3a0a7f93 (patch) | |
| tree | 56dcad22feb376d8bc16865228ae918f64944daf | |
| parent | f00f3bc4e5db04be036ec737e4ed9d9281f64eb3 (diff) | |
| parent | 6c79604cef5445b7c97a8ff95ee9860dde4292b0 (diff) | |
| download | ceph-a35b8650931b441621c130c85e30cb6f3a0a7f93.tar.gz | |
Merge pull request #137 from dalgaaf/wip-da-cleanup-includes
Cleanup some twice included header
Reviewed-by: Sage Weil <sage@inktank.com>
| -rw-r--r-- | src/common/Formatter.h | 1 | ||||
| -rw-r--r-- | src/mon/AuthMonitor.cc | 1 | ||||
| -rw-r--r-- | src/mon/LogMonitor.cc | 1 | ||||
| -rw-r--r-- | src/mon/MDSMonitor.cc | 5 | ||||
| -rw-r--r-- | src/test/test_snap_mapper.cc | 1 |
5 files changed, 1 insertions, 8 deletions
diff --git a/src/common/Formatter.h b/src/common/Formatter.h index 0f9a94a86ad..45d82aea534 100644 --- a/src/common/Formatter.h +++ b/src/common/Formatter.h @@ -9,7 +9,6 @@ #include <sstream> #include <stdarg.h> #include <string> -#include <list> namespace ceph { diff --git a/src/mon/AuthMonitor.cc b/src/mon/AuthMonitor.cc index 0761137784e..71f7bf69a5f 100644 --- a/src/mon/AuthMonitor.cc +++ b/src/mon/AuthMonitor.cc @@ -33,7 +33,6 @@ #include "common/config.h" #include "include/assert.h" -#include <sstream> #define dout_subsys ceph_subsys_mon #undef dout_prefix diff --git a/src/mon/LogMonitor.cc b/src/mon/LogMonitor.cc index c67979200a7..f540cdcdfbe 100644 --- a/src/mon/LogMonitor.cc +++ b/src/mon/LogMonitor.cc @@ -29,7 +29,6 @@ #include "common/errno.h" #include "common/config.h" #include "include/assert.h" -#include <sstream> #define dout_subsys ceph_subsys_mon #undef dout_prefix diff --git a/src/mon/MDSMonitor.cc b/src/mon/MDSMonitor.cc index c3b0c83588f..0ca0f78bf45 100644 --- a/src/mon/MDSMonitor.cc +++ b/src/mon/MDSMonitor.cc @@ -12,6 +12,7 @@ * */ +#include <sstream> #include "MDSMonitor.h" #include "Monitor.h" @@ -31,13 +32,9 @@ #include "common/perf_counters.h" #include "common/Timer.h" -#include <sstream> - #include "common/config.h" #include "include/assert.h" -#include "MonitorDBStore.h" - #define dout_subsys ceph_subsys_mon #undef dout_prefix #define dout_prefix _prefix(_dout, mon, mdsmap) diff --git a/src/test/test_snap_mapper.cc b/src/test/test_snap_mapper.cc index a3b250052ef..9e44ba32d97 100644 --- a/src/test/test_snap_mapper.cc +++ b/src/test/test_snap_mapper.cc @@ -4,7 +4,6 @@ #include <set> #include <boost/scoped_ptr.hpp> #include <sys/types.h> -#include <tr1/memory> #include "include/buffer.h" #include "common/map_cacher.hpp" |