commit 727bbeba35aeaf87804e3f78553e1eb8f5283459
Merge: 05807f9 8e4b725
Author: Klaus Aehlig <[email protected]>
Date: Mon Feb 1 12:59:37 2016 +0100
Merge branch 'stable-2.15' into stable-2.16
* stable-2.15
Do not add a new Inotify watchers on timer
Mock InitDrbdHelper's output in unittests
Optimise codegen for Python OpCode classes
Signed-off-by: Klaus Aehlig <[email protected]>
--
Klaus Aehlig
Google Germany GmbH, Erika-Mann-Str. 33, 80636 Muenchen
Registergericht und -nummer: Hamburg, HRB 86891
Sitz der Gesellschaft: Hamburg
Geschaeftsfuehrer: Matthew Scott Sucherman, Paul Terence Manicle
