« Previous | Next » 

Revision 71b770a9

ID71b770a916769cd4631dfb256da7c04274cd999a
Parent f3aebf6f, 22114677
Child 51b69fc8

Added by Klaus Aehlig over 6 years ago

Merge branch 'stable-2.11' into master

  • stable-2.11
    Setting correct permissions of client cert (split-user)
    Add luxid group to 'users-setup'
    Add some whitespace to fix formatting
    Consider old client cert only when available
    Fix return of 'Validate'
    Have SubmitManyJobs add entries to the reason trail
    Fix the dependencies of Makefile.ghc
    Include mond and confd only when configured
    Add reason for job pickup to the trail
    Add reason trail pickup constant
    Make the AddReason method public
    Have LuxiD add the "gnt:opcode" reason trail entry
    Add function for extending the reason trail in Luxid
    Update INSTALL wrt missing dependencies
    hsqueeze also partially implemented in 2.11
    While at it, fix the order of imports in OpCodes.hs
    Add a function for generating OpCode reason src. names
    Add a TH function for lower-cased stripped opcode names
    Generalize genConstrToStr to custom monadic functions

Conflicts:
Makefile.am: manually apply 7959b875 on master's version
src/Ganeti/Query/Server.hs: manually apply 0c779689 on
master's version

Signed-off-by: Klaus Aehlig <>
Reviewed-by: Jose A. Lopes <>

Files

  • added
  • modified
  • copied
  • renamed
  • deleted