Skip to content
  • Hrvoje Ribicic's avatar
    Merge branch 'stable-2.13' into stable-2.14 · f10e4caf
    Hrvoje Ribicic authored
    
    
    * stable-2.13
      Document hbal's additional levels of verbosity
    
    * stable-2.12
      (no changes)
    
    * stable-2.11
      (no changes)
    
    * stable-2.10
      Relax expectation of accuracy
      Improve rounding accuracty in updateStatistics
      Update gnt-backup manual to reflect real behavior
      Finalize local export only if successful
    
    * stable-2.9
      Stop MonD when removing a node from a cluster
    
    Conflicts:
    	lib/masterd/instance.py
    	man/gnt-backup.rst
    	test/hs/Test/Ganeti/Utils/Statistics.hs
    Resolution:
            instance.py: Take new variable name from 2.14, rest from 2.10
            gnt-backup.rst: Replace 2.14 paragraph with 2.10 one
            Statistics.hs: Use new test function
    
    Signed-off-by: default avatarHrvoje Ribicic <riba@google.com>
    Reviewed-by: default avatarPetr Pudlak <pudlak@google.com>
    f10e4caf