doc/examples/ganeti.initd.in | 10 10 + 0 - 0 !
1 file changed, 10 insertions(+)

 the upgrade from ganeti 1.2 makes the init script abort with
 ugly messages, so we edit the init script to exit early in this case.

tools/cfgupgrade12 | 4 4 + 0 - 0 !
1 file changed, 4 insertions(+)

 remove obsolete ssconf files
  Debian packaging relies on obsolete ssconf files to detect whether the
  upgrade has completed or not; this is not needed for upstream,
  although it is a good cleanup

htools/Ganeti/HTools/CLI.hs | 2 1 + 1 - 0 !
htools/Ganeti/HTools/ExtLoader.hs | 2 1 + 1 - 0 !
htools/Ganeti/HTools/IAlloc.hs | 2 1 + 1 - 0 !
htools/Ganeti/HTools/Program/Hail.hs | 4 2 + 2 - 0 !
htools/Ganeti/HTools/Program/Hbal.hs | 6 3 + 3 - 0 !
htools/Ganeti/HTools/Program/Hscan.hs | 6 3 + 3 - 0 !
htools/Ganeti/HTools/Program/Hspace.hs | 6 3 + 3 - 0 !
htools/htools.hs | 3 2 + 1 - 0 !
htools/test.hs | 2 1 + 1 - 0 !
9 files changed, 17 insertions(+), 16 deletions(-)

 fix old-style haskell imports
 Old-style imports (plain 'System') don't work anymore with GHC 7.4. Newer
 upstreams already fix this, but it hasn't been backported to 2.5.

lib/hypervisor/hv_kvm.py | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 fix obsolete -disable-kvm usage
 This is already a bug upstream, but pending proper fixing (per version keying,
 etc.), let's just use the correct version that will be shipped in Wheezy.
Bug: https://code.google.com/p/ganeti/issues/detail?id=250

lib/client/gnt_instance.py | 1 0 + 1 - 0 !
lib/cmdlib.py | 4 3 + 1 - 0 !
2 files changed, 3 insertions(+), 2 deletions(-)

 fix cve-2015-7945

Redact the DRBD secret from the disk logical ID in instance queries.