commit a6b2815562cb9b8887ed9da22ebb80884c0ca778
Merge: 5d0c33f bc7dda1
Author: Klaus Aehlig <[email protected]>
Date: Fri Jul 4 18:28:42 2014 +0200
Merge branch 'stable-2.11' into stable-2.12
* sable-2.11
(no changes)
* stable-2.10
(no changes)
* stable-2.9
Move the design for query splitting to the implemented list
Add tests for DRBD setups with empty first resource
* stable-2.8
DRBD parser: consume initial empty resource lines
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
