« Previous | Next » 

Revision 0c5f1b13

ID0c5f1b1319ca393a4aa91d4f27e8771363754627
Parent 191e5c19, b2e7599d
Child 6b604e1d

Added by Thomas Thrainer over 7 years ago

Merge branch 'stable-2.9' into master

  • stable-2.9
    Fix bridging in net-common
    Sync build_chroot with buildbot slack role
    Auto-upgrade of disks' config wrt LD-renaming
    Fix tests regarding DISK_LD_DEFAULTS
    Fixing renaming of DISK_LD_DEFAULTS
    Replace LD_* constants with DT_* constants
    QA: fix file storage QA wrt ipolicy
    Bump versions to release 2.9~beta1
    Add design-2.9 to docinput
    NEWS update and version bump for 2.8 rc2
    Lint improvements to regexps
    Add unit test for GetLinuxNodeInfo
    Prepare GetLinuxNodeInfo for testing
    Check right disk template in inst set params
    Make the DRBD collector more failure-resilient
    Add function to unwrap Results logging failures
    Fix bug in NodeD and RapiD usage strings
  • stable-2.8
    Make tools/users-setup explain its actions first
    Generate tools/users-setup from descriptions
    Provide ganeti user and group data in easy-to-parse form
    Remove dsahostkeypub during config downgrade
    Mark the DSA host pubkey as optional
    Fix documentation for gnt-node evacuate -p option

Conflicts:
Makefile.am (trivial)
devel/build_chroot (took changes from 2.9 but newer regex-pcre
version)
lib/cmdlib/cluster.py (followed LD_* -> DT_* change)
lib/objects.py (followed LD_* -> DT_* change)
test/py/ganeti.cmdlib_unittest.py (followed LD_* -> DT_* change)

The LD_* -> DT_* change required some more changes in the cmdlib unit
tests.

Signed-off-by: Thomas Thrainer <>
Reviewed-by: Klaus Aehlig <>

Files

  • added
  • modified
  • copied
  • renamed
  • deleted