commit 85b55b5fea5fef9bcc87e258caf449dd32077164
Merge: 41c2586 bd5b299
Author: Thomas Thrainer <[email protected]>
Date:   Wed May 14 14:35:02 2014 +0200

    Merge branch 'stable-2.12' into master
    
    * stable-2.12
      QA for 'gnt-cluster modify --install-image=...'
      Fix unit tests
      Serve OS install package through metadata daemon
      Refactor instance create to accommodate unsafe OS scripts
      Helper method to run OS scripts in a virtualized environment
      Helper method to handle the OS install package
      Extract code that runs OS scripts to a separate method
      RPC 'os_export'
      Generalize 'TemporaryDisk' to handle any number of disks
      Move 'DetermineImageSize' to 'ganeti.cmdlib.common'
      Add trusted/untrusted create scripts
      Add timeouts for OS install helper VM
      Add 'install_image' to bootstrap, CLI, opcodes, and queries
      Add 'install_image' param to 'Cluster'
      Fix 'IsInstanceRunning' to handle empty 'instance_info'
      Fix var reference from 'instance' instead of 'lu.instance'
      Fix dashes in environment names for OS params
      Fix sorting in CLI options
      Fix exception message to be consistent with others
      Fix typo in documentation
      Remove all references to the masterd socket
      Don't test for ganeti-masterd to exist
      Fix hard-coded list of daemons in test
      Do not start/stop ganeti-masterd
      Make luxid activate the master IP on startup
      Add a function to obtain the master nodes
      Add an RPC call to activate the master IP
      Add function to get master IP parameters from configuration
      Add an object describing the master network parameters
      Use getMasterOrCandidates
      Update environment test
      Update the NEWS file
      Update documentation
      Add tests for compression tool misuse
      Filter disallowed compression tools
      Forbid the compression tools from being set over RAPI
      Fix minor RAPI forbidden parameter handler error
      Add the compression tools parameter
      Make arbitrary compression tools work
      Add verification of compression tool existence
      Correct docstrings
      Disable protections against unknown compression types
      Extend offered compression types
      Extend tests in preparation for new compression types
      Remove the unit test for verifying node's DRBD reservations
      Fix the mocked ConfigWriter to pass DRBD minors methods
      Replace DRBD reservations in config.py with WConfd calls
      Export RPC functions for temp. DRBD reservations in WConfd
      Add the state of temporary DRBD reservations to WConfd
      Utility function for modifying an IORef using a lens
      New module for temporary reservation of config. resources
      Test the 'findFirst' function
      A utility function for finding the first unused element
      A function for listing the DRBD minors of an instance
    
    * stable-2.11
      Bump revision to 2.11.1
      Prepare NEWS file for 2.11.1
    
    * stable-2.10
      Postpone 2.10.4 release to May 15th
      Don't fail QA if submitting a job takes too long
      Revision bump for the 2.10.4 release
      Prepare NEWS file for 2.10.4 release
    
    * stable-2.9
      On expanding jobs, extend reason trail
      Add LC_ALL=en_US.UTF-8 before running check-man-warnings
    
    Conflicts:
        tools/cfgupgrade (take version of master)
    
    Signed-off-by: Thomas Thrainer <[email protected]>

Reply via email to