1. 22 Feb, 2011 2 commits
    • Michael Hanselmann's avatar
      Merge branch 'devel-2.4' · cbfa4f0f
      Michael Hanselmann authored
      
      
      * devel-2.4: (60 commits)
        Update news and bump version for 2.4.0 rc2
        Fix pylint warnings
        TestRapiInstanceRename use instance name
        Change the list formatting to a 'special' chars
        Add support for merging node groups
        Add option to rename groups on conflict
        Fix minor docstring typo
        Add QA rapi test for instance reinstall
        RAPI: remove required parameters for reinstall
        Fix HV/OS parameter validation on non-vm nodes
        NodeQuery: mark live fields as UNAVAIL for non-vm_capable nodes
        NodeQuery: don't query non-vm_capable nodes
        Fix LUClusterRepairDiskSizes and rpc result usage
        Fix RPC mismatch in blockdev_getsize[s]
        Remove superfluous redundant requirement
        Don't remove master_candidate flag from merged nodes
        Use a consistent ECID base
        listrunner: convert from getopt to optparse
        listrunner: fix agent usage
        Revert "Disable the cluster-merge tool for the moment"
        ...
      
      Conflicts:
      	NEWS: Trivial
      	lib/cli.py: Dropped _RSTATUS_TO_TEXT from master and used
          RSS_DESCRIPTION from devel-2.4 instead, adjusted users accordingly
      Signed-off-by: default avatarMichael Hanselmann <hansmi@google.com>
      Reviewed-by: default avatarIustin Pop <iustin@google.com>
      cbfa4f0f
    • Michael Hanselmann's avatar
      Add/rename label for LUXI in documentation · a1e43376
      Michael Hanselmann authored
      
      
      The HTTP server design doc will refer to the LUXI protocol,
      so conflicts need to be avoided.
      Signed-off-by: default avatarMichael Hanselmann <hansmi@google.com>
      Reviewed-by: default avatarIustin Pop <iustin@google.com>
      a1e43376
  2. 21 Feb, 2011 2 commits
    • Iustin Pop's avatar
      Update news and bump version for 2.4.0 rc2 · e41a1c0c
      Iustin Pop authored
      
      Signed-off-by: default avatarIustin Pop <iustin@google.com>
      Reviewed-by: default avatarRené Nussbaumer <rn@google.com>
      e41a1c0c
    • Iustin Pop's avatar
      Merge branch 'devel-2.4' into stable-2.4 · b31393a1
      Iustin Pop authored
      
      
      * devel-2.4: (23 commits)
        Fix pylint warnings
        Change the list formatting to a 'special' chars
        Add support for merging node groups
        Add option to rename groups on conflict
        Fix minor docstring typo
        Fix HV/OS parameter validation on non-vm nodes
        NodeQuery: mark live fields as UNAVAIL for non-vm_capable nodes
        NodeQuery: don't query non-vm_capable nodes
        Remove superfluous redundant requirement
        Don't remove master_candidate flag from merged nodes
        Use a consistent ECID base
        listrunner: convert from getopt to optparse
        listrunner: fix agent usage
        Revert "Disable the cluster-merge tool for the moment"
        Fix cluster-merging by not stopping noded
        Fix error msg for instances on offline nodes
        Minor reordering to match param order
        cluster verify and instance disks on offline nodes
        Cluster verify and N+1 warnings for offline nodes
        Handle gnt-instance shutdown --all for empty clusters
        Use gnt-node add --force-join to add foreign nodes
        Add --force-join option to gnt-node add
        Fix iterating over node groups
      
      Of the above commits present in the devel-2.4 branch, only the “Add
      --force-join option to gnt-node add” is a potential issue, but this
      has been QA-ed successfully. The other fixes are split in three
      groups:
      
      - non-core changes (cluster-merge, listrunner)
      - trivial fixes (docstrings, etc.)
      - bugs that we want fixed
      
      As such, instead of cherry-picking only individual patches, I propose
      that we unify stable and devel 2.4 and make a new RC out of the
      result.
      Signed-off-by: default avatarIustin Pop <iustin@google.com>
      Reviewed-by: default avatarMichael Hanselmann <hansmi@google.com>
      b31393a1
  3. 18 Feb, 2011 8 commits
  4. 17 Feb, 2011 9 commits
  5. 16 Feb, 2011 5 commits
  6. 15 Feb, 2011 14 commits