Merge branch 'collectd-4.2'
authorFlorian Forster <octo@huhu.verplant.org>
Thu, 13 Dec 2007 07:16:16 +0000 (08:16 +0100)
committerFlorian Forster <octo@huhu.verplant.org>
Thu, 13 Dec 2007 07:16:16 +0000 (08:16 +0100)
Conflicts:

src/utils_llist.c

1  2 
src/collectd-perl.pod
src/collectd.conf.pod
src/logfile.c
src/utils_avltree.c
src/utils_llist.c

Simple merge
Simple merge
diff --cc src/logfile.c
Simple merge
Simple merge
@@@ -106,7 -110,9 +106,11 @@@ void llist_prepend (llist_t *l, llentry
  {
        e->next = l->head;
        l->head = e;
+       if (l->tail == NULL)
+               l->tail = e;
++
 +      ++(l->size);
  }
  
  void llist_remove (llist_t *l, llentry_t *e)