From: Iustin Pop <ius...@google.com> This is now for the 2.16 stable branch. Before committing these, merge with 2.15 after my two previous patches, with the conflicts solved as follows:
- lib/cluster/verify.py: keep our version (the one with enable/disable), dropping the C0xx message as not needed - src/Ganeti/THH.hs: keep their version, as the function was removed Iustin Pop (2): Fix line-too long errors Fix lint or silence errors lib/backend.py | 1 + lib/http/client.py | 1 + lib/http/server.py | 9 ++++++--- lib/storage/base.py | 1 + lib/storage/bdev.py | 3 +-- src/Ganeti/Config.hs | 5 +++-- src/Ganeti/JQScheduler.hs | 5 +++-- src/Ganeti/Rpc.hs | 2 +- test/py/ganeti.storage.bdev_unittest.py | 6 ++++-- test/py/ganeti.storage.gluster_unittest.py | 3 ++- 10 files changed, 23 insertions(+), 13 deletions(-) mode change 100644 => 100755 test/py/ganeti.storage.gluster_unittest.py -- 2.8.1
