Skip to content
Snippets Groups Projects
  1. May 12, 2011
  2. May 11, 2011
    • Guido Trotter's avatar
      Remove references to acquired_locks · d9f99d88
      Guido Trotter authored
      
      These sneaked in from 2.4 during the merge, but this attribute is
      actually gone in the master branch.
      
      Signed-off-by: default avatarGuido Trotter <ultrotter@google.com>
      Reviewed-by: default avatarMichael Hanselmann <hansmi@google.com>
      d9f99d88
    • Guido Trotter's avatar
      Merge branch 'devel-2.4' · 93384b8c
      Guido Trotter authored
      
      * devel-2.4:
        Use floppy disk and a second CDROM on KVM
        Document the selection of instance kernels
        Make root_path an optional hypervisor parameter
        Some man page updates
        Add 2 new variables to the OS scripts environment
        Add --no-wait-for-sync when converting to drbd
        Recreate instance disks: allow changing nodes
        Rename instance: only show new name when different
        Fix race condition in LUGroupAssignNodes
        Re-wrap and fix formatting issues in gnt-instance.rst
        Documentation for the new parameters for KVM
        cmdlib: Fix typo, s/nick/NIC/
        A small optimisation in cluster verify
        A few docstring fixes
        luxi: do not handle KeyboardInterrupt
        Handle EPIPE errors while writing to the terminal
        Cluster verify: check for missing bridges
      
      Conflicts:
      	lib/cmdlib.py
                - manually merge the 2.4 fix
      	lib/opcodes.py
                - add new field from 2.4, but also describe it
      	man/gnt-cluster.rst
      	man/gnt-instance.rst
      	man/gnt-node.rst
                - merge new attributes with general 2.4 manpage fixes
      
      Signed-off-by: default avatarGuido Trotter <ultrotter@google.com>
      Reviewed-by: default avatarIustin Pop <iustin@google.com>
      93384b8c
  3. May 10, 2011
  4. May 09, 2011
  5. May 06, 2011
  6. May 05, 2011
  7. May 04, 2011
  8. May 03, 2011
Loading