• Hrvoje Ribicic's avatar
    Merge branch 'stable-2.13' into stable-2.14 · 73505302
    Hrvoje Ribicic authored
    * stable-2.13
      Break lines longer than 80 chars
      Be gentler to failures while removing SSH keys
    
    * stable-2.12
      Upgrade codebase to support monad-control >=0.3.1.3 && <1.1
      Add macros for the version of monad-control
      Rename hs-lens-versions Makefile target to hs-pkg-versions
      Verify master status before retrying a socket
      Make LUClusterDestroy tell WConfD
      Add an RPC to prepare cluster destruction
      Support no-master state in ssconf
      WConfD: do not clean up own livelock
      Make WConfD have a livelock file as well
      Add a prefix for a WConfD livelock
      Detect if the own job file disappears
      Keep track of the number LUs executing
      Make job processes keep track of their job id
      Make LuxiD clean up its lock file
    
    * stable-2.11
      Improve error handling when looking up instances
      Capture last exception
    
    Conflicts:
    	.gitignore
    	Makefile.am
    	lib/cmdlib/cluster/verify.py
    	src/Ganeti/Constants.hs
    	src/Ganeti/WConfd/Monad.hs
    	src/Ganeti/WConfd/Server.hs
    Resolution:
    	.gitignore, Makefile.am: Remove 2.12 versions file.
    	verify.py: Manually handle the file split.
    	Constants.hs, Server.hs: Choose one of the competing names.
    	Monad.hs: Use C++-resistant strings, triggerWithResult.
    Signed-off-by: default avatarHrvoje Ribicic <riba@google.com>
    Reviewed-by: default avatarPetr Pudlak <pudlak@google.com>
    73505302
mcpu.py 24.1 KB