commit b790cb8291ec8f6e8847d3005684d9051a759cd0
Merge: 0f51d8c 8212220
Author: Klaus Aehlig <[email protected]>
Date: Mon Sep 15 16:41:53 2014 +0200
Merge branch 'stable-2.12' into master
* stable-2.12
Adapt license statement
en nic_type related opts inside _WriteNicConfig()
Fix NIC options in Xen's config files
* stable-2.11
Change license statment in newly added files
Make userspace access checks properly strict
* stable-2.10
Update the license statement
Fix handling of the --online option
Add warning against hvparam changes with live migrations
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
