[collectd-changes] collectd, the system statistics collection daemon: Changes to 'master'

[Florian Forster]

 src/processes.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit fe9ba13c8866ada19f7a347f3757d4c740613cdb
Merge: 085a993e0f187ad73d3a28cea508ec6e56c39516 8692579147f7e5cfbd4168a2da926dfd20e592f4
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Mon May 4 19:25:01 2009 +0200

    Merge branch 'collectd-4.6' into collectd-4.7

commit 8692579147f7e5cfbd4168a2da926dfd20e592f4
Author: Doug MacEachern <dougm at hyperic.com>
Date:   Mon May 4 19:22:43 2009 +0200

    Set process vmem_size and stack_size on FreeBSD
    
       Fixes:
       processes.c: In function 'ps_read':
       processes.c:328: warning: 'pse.vmem_size' is used uninitialized in this function
       processes.c:1300: note: 'pse.vmem_size' was declared here
       processes.c:330: warning: 'pse.stack_size' is used uninitialized in this function
       processes.c:1300: note: 'pse.stack_size' was declared here
    
    Signed-off-by: Doug MacEachern <dougm at hyperic.com>
    Signed-off-by: Florian Forster <octo at huhu.verplant.org>
    
    Cherry-picked *again* because the initial commit to the collectd-4.5
    branch was incorrect. collectd-4.6 is the branch this should be in.
    
    Conflicts:
    
    	src/processes.c