diff -uNr upstream-ganglia/debian/changelog fastly-ganglia/debian/changelog
--- upstream-ganglia/debian/changelog   2011-07-05 12:49:53.326995000 -0400
+++ fastly-ganglia/debian/changelog 2011-07-07 10:49:29.952319239 -0400
@@ -1,3 +1,34 @@
+ganglia (3.2.0-7) unstable; urgency=low
+
+  * Stop recording and propagating dmax entries asap
+  * Dont save the last grid twice
+
+ -- Artur Bergman <artur@fastly.com>  Thu, 07 Jul 2011 03:23:28 +0000
+
+ganglia (3.2.0-6) unstable; urgency=low
+
+  * Propagate DMAX you piece of shit
+
+ -- Artur Bergman <artur@fastly.com>  Thu, 07 Jul 2011 01:54:48 +0000
+
+ganglia (3.2.0-5) unstable; urgency=low
+
+  * Fix to read the string value
+
+ -- Artur Bergman <artur@fastly.com>  Wed, 06 Jul 2011 19:42:52 +0000
+
+ganglia (3.2.0-4) unstable; urgency=low
+
+  * Actually fix code
+
+ -- Artur Bergman <artur@fastly.com>  Wed, 06 Jul 2011 17:32:13 +0000
+
+ganglia (3.2.0-4) unstable; urgency=low
+
+  * Re-export tags from gmetad
+
+ -- Artur Bergman <artur@fastly.com>  Wed, 06 Jul 2011 16:38:49 +0000
+
 ganglia (3.2.0-3) unstable; urgency=low

   * Fix jasons broken adduser
diff -uNr upstream-ganglia/gmetad/gmetad.h fastly-ganglia/gmetad/gmetad.h
--- upstream-ganglia/gmetad/gmetad.h    2011-07-01 12:14:12.641109000 -0400
+++ fastly-ganglia/gmetad/gmetad.h  2011-07-07 10:49:29.962319239 -0400
@@ -189,6 +189,7 @@
       uint32_t tmax;
       uint32_t dmax;
       short int location;
+      short int tags;
       uint32_t reported;
       uint32_t started;
       short int stringslen;
diff -uNr upstream-ganglia/gmetad/process_xml.c fastly-ganglia/gmetad/process_xml.c
--- upstream-ganglia/gmetad/process_xml.c   2010-02-05 17:03:45.236452000 -0500
+++ fastly-ganglia/gmetad/process_xml.c 2011-07-07 10:49:29.962319239 -0400
@@ -482,6 +482,7 @@
    edge = 0;

    host->location = -1;
+   host->tags = -1;
    host->reported = reported;
    host->tn = tn;
    host->tmax = tmax;
@@ -508,6 +509,9 @@
                case LOCATION_TAG:
                   host->location = addstring(host->strings, &edge, attr[i+1]);
                   break;
+          case TAGS_TAG:
+         host->tags = addstring(host->strings, &edge, attr[i+1]);
+         break;
                case STARTED_TAG:
                   host->started = strtoul(attr[i+1], (char **)NULL, 10);
                   break;
@@ -628,6 +632,10 @@
       {
          /* Save the data to a round robin database if the data source is alive
           */
+         fillmetric(attr, metric, type);
+    if (metric->dmax && metric->tn > metric->dmax)
+          return;
+
          if (do_summary && !xmldata->ds->dead && !xmldata->rval)
             {
                   debug_msg("Updating host %s, metric %s",
@@ -640,7 +648,7 @@
          metric->report_start = metric_report_start;
          metric->report_end = metric_report_end;

-         fillmetric(attr, metric, type);
+
          edge = metric->stringslen;
          metric->name = addstring(metric->strings, &edge, name);
          metric->stringslen = edge;
@@ -1164,7 +1172,7 @@
       {
          case GRID_TAG:
             rc = endElement_GRID(data, el);
-            /* No break. */
+       break;

          case CLUSTER_TAG:
             rc = endElement_CLUSTER(data, el);
diff -uNr upstream-ganglia/gmetad/server.c fastly-ganglia/gmetad/server.c
--- upstream-ganglia/gmetad/server.c    2009-01-25 06:18:30.107438000 -0500
+++ fastly-ganglia/gmetad/server.c  2011-07-07 10:49:29.962319239 -0400
@@ -141,6 +141,9 @@
    tn = client->now.tv_sec - metric->t0.tv_sec;
    if (tn<0) tn = 0;

+   if (metric->dmax && metric->dmax < tn)
+     return 0;
+
    rc=xml_print(client, "<METRIC NAME=\"%s\" VAL=\"%s\" TYPE=\"%s\" "
       "UNITS=\"%s\" TN=\"%u\" TMAX=\"%u\" DMAX=\"%u\" SLOPE=\"%s\" "
       "SOURCE=\"%s\">\n",
@@ -186,10 +189,10 @@

    /* Note the hash key is the host's IP address. */
    rc = xml_print(client, "<HOST NAME=\"%s\" IP=\"%s\" REPORTED=\"%u\" "
-      "TN=\"%u\" TMAX=\"%u\" DMAX=\"%u\" LOCATION=\"%s\" GMOND_STARTED=\"%u\">\n",
+      "TN=\"%u\" TMAX=\"%u\" DMAX=\"%u\" LOCATION=\"%s\" GMOND_STARTED=\"%u\" TAGS=\"%s\">\n",
       name, getfield(host->strings, host->ip), host->reported, tn,
       host->tmax, host->dmax, getfield(host->strings, host->location),
-      host->started);
+         host->started, getfield(host->strings, host->tags));

    return rc;
 }
diff -uNr upstream-ganglia/gmond/gmond.c fastly-ganglia/gmond/gmond.c
--- upstream-ganglia/gmond/gmond.c  2011-06-27 15:47:46.437353000 -0400
+++ fastly-ganglia/gmond/gmond.c    2011-07-07 10:49:29.962319239 -0400
@@ -1622,13 +1622,14 @@
     }

   len = apr_snprintf(metricxml, 1024,
-          "<METRIC NAME=\"%s\" VAL=\"%s\" TYPE=\"%s\" UNITS=\"%s\" TN=\"%d\" TMAX=\"%d\" DMAX=\"0\" SLOPE=\"%s\">\n",
+          "<METRIC NAME=\"%s\" VAL=\"%s\" TYPE=\"%s\" UNITS=\"%s\" TN=\"%d\" TMAX=\"%d\" DMAX=\"%d\" SLOPE=\"%s\">\n",
               metricName,
               gmetric_value_to_str(&(val->message_u.v_message)),
               data->message_u.f_message.Ganglia_metadata_msg_u.gfull.metric.type,
               data->message_u.f_message.Ganglia_metadata_msg_u.gfull.metric.units,
               (int)((now - val->last_heard_from) / APR_USEC_PER_SEC),
               data->message_u.f_message.Ganglia_metadata_msg_u.gfull.metric.tmax,
+              data->message_u.f_message.Ganglia_metadata_msg_u.gfull.metric.dmax,
               slope_to_cstr(data->message_u.f_message.Ganglia_metadata_msg_u.gfull.metric.slope));

   if (metricName) free(metricName);