commit 3eac1fd4ea4c2e55817ae63234ca20ecdbe63f4f
Merge: f6fbf5a 21e2cc8
Author: Klaus Aehlig <[email protected]>
Date: Thu Jul 24 10:16:59 2014 +0200
Merge branch 'stable-2.12' into master
* stable-2.12
Remove obsolete assertion
Retry connections to WConfD
Always eventually free release the BGL
* stable-2.11
(no changes)
* stable-2.10
KVM: fix NIC configuration with absent NIC VLAN
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
