prometheus/prometheus — pull request #416 by u-c-l (2014-12-03 17:08:31+00:00)
Title: Remove the remaining races, new and old.

Also, resolve a few other TODOs.

Change-Id: Icb39b5a5e8ca22ebcb48771cd8951c5d9e112691

@juliusv