1. 25 Mar, 2015 6 commits
  2. 24 Mar, 2015 19 commits
  3. 20 Mar, 2015 2 commits
    • Petr Pudlak's avatar
      Merge branch 'stable-2.12' into stable-2.13 · 7420ec46
      Petr Pudlak authored
      * stable-2.12
        QA: Fix CheckFileUnmodified to work with vcluster
        QA: Fix white-spaces in CheckFileUnmodified
        QA: Check that the cluster verify doesn't change the config
        QA: Allow to check that an operation doesn't change a file
        Use only shared configuration lock for ComputeDRBDMap
        Only assert properties of non-None objects
        If any IO error happens during job forking, retry
        Add a function for retrying `MonadError` computations
      
      * stable-2.11
        Improve speed of Xen hypervisor unit tests
        Improve Xen instance state handling
      
      * stable-2.10
        Make QA fail if KVM hotplugging fails
        Always preserve QA command output
        Don't lose stdout/stderr in AssertCommand
        qa_utils: Allow passing fail=None to AssertCommand
        qa_utils: Make AssertCommand return stdout/stderr as well
        Allow plain/DRBD conversions regardless of lack of disks
        Add support for ipolicy modifications to mock config
      
      Conflicts:
      	lib/cmdlib/instance.py - propagate changes from 2.12
      	qa/qa_cluster.py - propagate changes from 2.12
      	qa/qa_instance.py - propagate changes from 2.12
      	qa/qa_utils.py - propagate changes from 2.12
      	src/Ganeti/Utils/Monad.hs - merge changes from both branches
      Signed-off-by: 's avatarPetr Pudlak <pudlak@google.com>
      Reviewed-by: 's avatarHrvoje Ribicic <riba@google.com>
      7420ec46
    • Helga Velroyen's avatar
      Capture last exception · c1ff2832
      Helga Velroyen authored
      This fixes a minor problem in LURenewCrypto, where we
      use the exception variable after the try/except block.
      By assigning it to a previously initialized one, we make
      sure that we can access this information.
      Signed-off-by: 's avatarHelga Velroyen <helgav@google.com>
      Reviewed-by: 's avatarPetr Pudlak <pudlak@google.com>
      c1ff2832
  4. 19 Mar, 2015 8 commits
  5. 18 Mar, 2015 5 commits