« Previous | Next » 

Revision a4417db4

IDa4417db498e30891fe1adac99a5dc79535d2e55f
Parent 0808e9d5, adef95a2
Child 7c3a6391

Added by Thomas Thrainer almost 10 years ago

Merge branch 'stable-2.10' into master

Merge branch 'stable-2.10' into master

  • stable-2.10
    Don't allow optional node parameters
    Move OVS node parameters to the right place
    Make NIC VLAN queryable
    Pass VLAN parameter correctly in moves
    Use constant instead of raw string
    Merge 'hs2py-constants' into 'hs2py'
    Add flag '--opcodes' to 'hs2py'
    Sort design docs alphabetically
    Missing design docs from distribution
    When loading configuration fails, include the reason
    Fixing rapi documentation wrt to storage types
    Move Haskell constants to proper module
    Tear down Py2Hs constant infrastructure
    Hs2Py constants: additional module jstore
    Hs2Py constants: additional module errors
    Hs2Py constants: additional module qlang
    Hs2Py constants: additional module luxi
    Remove module 'ganeti.constants' from 'convert-constants'
    Fix reference to vcs version in query server
    Eliminate unused constants
    Use configure constants instead of generated
    Hs2Py constants: add 'UUID_REGEX'
    Add 'AF_INET*' constants to Haskell's 'AutoConf'
    Python autotool to print socket constants
  • stable-2.9
    Bump revision for 2.9.1
    Update NEWS and schedule release for 2.9.1
    Fix retrieval of xen command in class method
    Fix docstring for ganeti.storage.filestorage_unittest.py
    Undo revision bump
    Postpone release of 2.9.1
    Revision bump for 2.9.1
    Update NEWS for 2.9.1 release
    Readd nodes as online
    When verifying BRBD version, ignore missing values
  • stable-2.8
    Version bump for 2.8.2
    Update NEWS file for 2.8.2 release
    DRBD: ensure peers are UpToDate for dual-primary

Conflicts:
Makefile.am: Add design docs from both sides (sorted); Remove
rules for hs2py-constants
lib/hypervisor/hv_xen.py: Merge parameter list of
GetInstanceConsole
lib/luxi.py: Use generated constant for REQ_PICKUP_JOB
src/Ganeti/ConfigReader.hs: trivial
src/Ganeti/HsConstants.hs: Manually add UserDown and ndSshPort
related constants to Constants.hs
src/Ganeti/Query/Server.hs: trivial

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

Files

  • added
  • modified
  • copied
  • renamed
  • deleted