Merge "Make statsd sampling rates configurable"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 5 Sep 2016 08:52:54 +0000 (08:52 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 5 Sep 2016 08:52:54 +0000 (08:52 +0000)
1  2 
includes/DefaultSettings.php
includes/GlobalFunctions.php

Simple merge
Simple merge