Merge branch 'stable-2.11' into stable-2.12
authorKlaus Aehlig <aehlig@google.com>
Tue, 12 Jan 2016 15:46:43 +0000 (16:46 +0100)
committerKlaus Aehlig <aehlig@google.com>
Tue, 12 Jan 2016 16:53:39 +0000 (17:53 +0100)
commitc4164c648d68d7d0f682dae8a0f709cc1f10f9ee
tree5b648ed027d22f1e0ea2d758b5ddcb70851cb6ed
parenteef3bf44c05b091a3b1f97ef3c951b8836d296fc
parent7e6b6b0b8ada0e77e27eec723e20c820b1978594
Merge branch 'stable-2.11' into stable-2.12

* stable-2.11
  (no changes)

* stable-2.10
  KVM: explicitly configure routed NICs late

Signed-off-by: Klaus Aehlig <aehlig@google.com>
Reviewed-by: Hrvoje Ribicic <riba@google.com>
lib/hypervisor/hv_kvm/__init__.py