Merge "Revert "Remove deprecated profiling config parameters, clarify docs""
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 4 Dec 2014 21:46:31 +0000 (21:46 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 4 Dec 2014 21:46:31 +0000 (21:46 +0000)
commit40da41acca129ca1ccc1b443c44e28698e83c608
tree70c0e90b2d53cef6dfb21b306744abc9086e902a
parent03110e938deab57f0962204ed7fe0be4943dbfaf
parent7dba64f2c1195e8b8a2a2fa0f119fee845b7da4b
Merge "Revert "Remove deprecated profiling config parameters, clarify docs""