Merge branch 'stable-2.15' into stable-2.16
authorKlaus Aehlig <aehlig@google.com>
Mon, 1 Feb 2016 11:59:37 +0000 (12:59 +0100)
committerKlaus Aehlig <aehlig@google.com>
Mon, 1 Feb 2016 12:28:13 +0000 (13:28 +0100)
* 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 <aehlig@google.com>
Reviewed-by: Hrvoje Ribicic <riba@google.com>

1  2 
lib/client/gnt_cluster.py
test/py/ganeti.client.gnt_cluster_unittest.py

Simple merge