Skip to content
  • Michael Hanselmann's avatar
    Merge branch 'devel-2.4' · af7b6689
    Michael Hanselmann authored
    
    
    * devel-2.4:
      LUInstanceQueryData: Don't acquire locks unless requested
      Increase the lock timeouts before we block-acquire
      daemon.py: move startup log message before prep_fn
      Display the actual memory values in N+1 failures
      ssh.VerifyNodeHostname: remove the quiet flag
      Add error checking and merging for cluster params
      RAPI: Document need for Content-type header in requests
      Fix output for “gnt-job info”
      watcher: Fix misleading usage output
      Clarify --force-join parameter message
      locking: Fix race condition in lock monitor
      utils: Export NiceSortKey function
      Revert "Only merge nodes that are known to not be offline"
      cluster-merge: only operate on online nodes
      Only merge nodes that are known to not be offline
      Treat empty oob_program param as default
      Fix bug in instance listing with orphan instances
      Fix bug related to log opening failures
      Bump version for 2.4.1 release
      cfgupgrade: Fix critical bug overwriting RAPI users file
    
    Conflicts:
    	NEWS: Trivial
    	lib/opcodes.py: Added parameter descriptions, used variable for
    	  "use_locking"
    
    Signed-off-by: default avatarMichael Hanselmann <hansmi@google.com>
    Reviewed-by: default avatarRené Nussbaumer <rn@google.com>
    af7b6689
To find the state of this project's repository at the time of any of these versions, check out the tags.