• Klaus Aehlig's avatar
    Merge branch 'stable-2.12' into stable-2.13 · eecc4b88
    Klaus Aehlig authored
    * 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:
    	src/Ganeti/BasicTypes.hs
    	src/Ganeti/Logging/WriterLog.hs
    	src/Ganeti/THH/HsRPC.hs
    	src/Ganeti/WConfd/Core.hs
    	src/Ganeti/WConfd/Monad.hs
    Resolution:
    	Use all the language pragmas
    Signed-off-by: default avatarKlaus Aehlig <aehlig@google.com>
    Reviewed-by: default avatarHelga Velroyen <helgav@google.com>
    eecc4b88
Name
Last commit
Last update
..
__init__.py Loading commit data...
exec.py Loading commit data...