projects / ganeti-local / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 35bdbec 0be5f29)
Merge branch 'stable-2.9' into stable-2.10
authorKlaus Aehlig <aehlig@google.com>
Mon, 21 Oct 2013 15:18:49 +0000 (17:18 +0200)
committerKlaus Aehlig <aehlig@google.com>
Mon, 21 Oct 2013 16:07:07 +0000 (18:07 +0200)
commitb72af2b35f656a82c4974e200a67073a325665af
tree47e51459f4612c7e953dc02af29b786c519ddcb1tree | snapshot
parent35bdbec3aa0958f78e6fe20e9885ca02b933f005commit | diff
parent0be5f2921f968d6f2ba7da1844eb841c486bf99fcommit | diff
Merge branch 'stable-2.9' into stable-2.10

* stable-2.9
  Start NEWS entry for 2.9.0 rc4

* stable-2.8
  Version bump for 2.8.1
  Verify that ConfD is running after master-failover
  daemon-util: handle luxid in {start,stop}_master()
  Fix typo in storage.FileStorage docstring
  Fix path for serial file

Conflicts:
NEWS: take both additions

Signed-off-by: Klaus Aehlig <aehlig@google.com>
Reviewed-by: Jose A. Lopes <jabolopes@google.com>
NEWS diff1 | diff2 | blob | history
lib/storage/bdev.py diff1 | diff2 | blob | history
qa/qa_cluster.py diff1 | diff2 | blob | history
src/Ganeti/Path.hs diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.