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)
* 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>

1  2 
lib/hypervisor/hv_kvm/__init__.py

Simple merge