Merge branch 'collectd-5.5'

diff --cc src/email.c
Simple merge

diff --cc src/gmond.c
index c778d48,2ac9f25..f86d8f7
--- 1/src/gmond.c
--- 2/src/gmond.c
+++ b/src/gmond.c
@@@ -476,39 -494,9 +491,9 @@@ static staging_entry_t *staging_entry_g
    return (se);
  } /* }}} staging_entry_t *staging_entry_get */
  
- static int staging_entry_submit (const char *host, const char *name, /* {{{ */
-     staging_entry_t *se)
- {
-   value_list_t vl;
-   value_t values[se->vl.values_len];
- 
-   if (se->vl.interval == 0)
-   {
-     /* No meta data has been received for this metric yet. */
-     se->flags = 0;
-     pthread_mutex_unlock (&staging_lock);
-     request_meta_data (host, name);
-     return (0);
-   }
- 
-   se->flags = 0;
- 
-   memcpy (values, se->vl.values, sizeof (values));
-   memcpy (&vl, &se->vl, sizeof (vl));
- 
-   /* Unlock before calling `plugin_dispatch_values'.. */
-   pthread_mutex_unlock (&staging_lock);
- 
-   vl.values = values;
- 
-   plugin_dispatch_values (&vl);
- 
-   return (0);
- } /* }}} int staging_entry_submit */
- 
  static int staging_entry_update (const char *host, const char *name, /* {{{ */
      const char *type, const char *type_instance,
 -    int ds_index, int ds_type, value_t value)
 +    size_t ds_index, int ds_type, value_t value)
  {
    const data_set_t *ds;
    staging_entry_t *se;

diff --cc src/perl.c
Simple merge