commit d455f669cc0a6e4365bf7d100c89f15a98d4d9be
Merge: 343309c 9b91bd4
Author: Klaus Aehlig <[email protected]>
Date: Fri Jul 4 17:43:53 2014 +0200
Merge branch 'stable-2.10' into stable-2.11
* 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
Conflicts:
doc/design-draft.rst: trivial
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
