commit 800de8f6e0cc44b71b5f34495a41d9fd65b42c26
Merge: 08bc274 38f30e3
Author: Klaus Aehlig <[email protected]>
Date: Fri Dec 19 13:39:55 2014 +0100
Merge branch 'stable-2.13' into master
* stable-2.13
LXC: Drop CAP_SYS_ADMIN by default
Fix Xen's NIC file
* stable-2.12
Fix order of arguments for key check
Add developer target py-tests
Fix wrong test
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
