projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update to resolve conflicts due to renamed files
[collectd.git]
/
src
/
aggregation.c
diff --git
a/src/aggregation.c
b/src/aggregation.c
index
a802199
..
089ff1d
100644
(file)
--- a/
src/aggregation.c
+++ b/
src/aggregation.c
@@
-26,12
+26,12
@@
#include "collectd.h"
#include "collectd.h"
-#include "common.h"
-#include "meta_data.h"
#include "plugin.h"
#include "plugin.h"
+#include "utils/common/common.h"
+#include "utils/lookup/vl_lookup.h"
+#include "utils/metadata/meta_data.h"
#include "utils_cache.h" /* for uc_get_rate() */
#include "utils_subst.h"
#include "utils_cache.h" /* for uc_get_rate() */
#include "utils_subst.h"
-#include "utils_vl_lookup.h"
#define AGG_MATCHES_ALL(str) (strcmp("/.*/", str) == 0)
#define AGG_FUNC_PLACEHOLDER "%{aggregation}"
#define AGG_MATCHES_ALL(str) (strcmp("/.*/", str) == 0)
#define AGG_FUNC_PLACEHOLDER "%{aggregation}"