Merge branch 'master' into influxdb-sink

Ville Koskela · Ville Koskela · commit e6a6924f6cd5 · 2016-04-07T15:23:20.000-07:00
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
@@ -4,6 +4,7 @@ Contributors
 The following people have made source contributions to the metrics aggregator daemon project:
 
 * Brandon Arp (barp at groupon dot com)
+* Daniel Guerrero (dguerreromartin at groupon dot com)
 * Ville Koskela (vkoskela at groupon dot com)
 
 &copy; Groupon Inc., 2016
