projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'collectd-4.5' into collectd-4.6
[collectd.git]
/
src
/
vserver.c
diff --git
a/src/vserver.c
b/src/vserver.c
index
8fdae27
..
1615ca0
100644
(file)
--- a/
src/vserver.c
+++ b/
src/vserver.c
@@
-1,6
+1,7
@@
/**
* collectd - src/vserver.c
* Copyright (C) 2006,2007 Sebastian Harl
/**
* collectd - src/vserver.c
* Copyright (C) 2006,2007 Sebastian Harl
+ * Copyright (C) 2007,2008 Florian octo Forster
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@
-17,6
+18,7
@@
*
* Authors:
* Sebastian Harl <sh at tokkee.org>
*
* Authors:
* Sebastian Harl <sh at tokkee.org>
+ * Florian octo Forster <octo at verplant.org>
**/
#include "collectd.h"
**/
#include "collectd.h"