Merge "Under HHVM, measure resources for the thread, not calling process"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 10 Sep 2014 19:20:03 +0000 (19:20 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 10 Sep 2014 19:20:03 +0000 (19:20 +0000)
commitca1ec03b8cbae5630e892e3b246efcb7e08ae922
tree756c28119dcfc1d8f81f871aff3cd3f553ed1245
parent9d5d3b688da8788090adeebba3ecd3d771e2ccfe
parent4ee9063956ba1a3e7fcc1195b5034f128267ab35
Merge "Under HHVM, measure resources for the thread, not calling process"
includes/parser/ParserOutput.php