commit bcc61d0abc07f45cc0f3a782d8dc3c23599d6e4b
Merge: ee12ac9 ef8f845
Author: Klaus Aehlig <[email protected]>
Date: Wed Mar 4 18:15:36 2015 +0100
Merge branch 'stable-2.11' into stable-2.12
* stable-2.11
(no changes)
* stable-2.10
Remove unused import
Use an old way to instance NFData CollectorData
MonD: force computation of state in stateful collectors
Instance NFData CollectorData
Signed-off-by: Klaus Aehlig <[email protected]>
--
Klaus Aehlig
Google Germany GmbH, Dienerstr. 12, 80331 Muenchen
Registergericht und -nummer: Hamburg, HRB 86891
Sitz der Gesellschaft: Hamburg
Geschaeftsfuehrer: Graham Law, Christine Elizabeth Flores