commit bc354772522e6831638b4a78b263f385e6e25193
Merge: aea1dc1 fe6287b
Author: Hrvoje Ribicic <[email protected]>
Date: Wed Aug 19 12:30:50 2015 +0200
Merge branch 'stable-2.12' into stable-2.13
* stable-2.12
Fix disabling of user shutdown reporting
Make confd answer disk requests querying by name
gnt-node add: password auth is only one method
Signed-off-by: Hrvoje Ribicic <[email protected]>
Hrvoje Ribicic
Ganeti Engineering
Google Germany GmbH
Dienerstr. 12, 80331, München
Geschäftsführer: Graham Law, Christine Elizabeth Flores
Registergericht und -nummer: Hamburg, HRB 86891
Sitz der Gesellschaft: Hamburg
