commit d3505bd7ce4f71c735d5b3cc2c0a7affea21b14b
Merge: c36c45d 7b7da57
Author: Klaus Aehlig <[email protected]>
Date: Fri Jul 4 14:19:20 2014 +0200
Merge branch 'stable-2.9' into stable-2.10
* stable-2.9
Add tests for DRBD setups with empty first resource
* stable-2.8
DRBD parser: consume initial empty resource lines
Singed-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
