Revision 615dc49b
| ID | 615dc49b1b6e6a37d8e553c6add13034d650d0f0 |
| Parent | 48297fa2, c8e0a534 |
| Child | 5c3b5f99 |
Merge branch 'branch-2.1' into feature/containers
- branch-2.1: (48 commits)
Doc fixes for RAPI
Release 2.0rc5
Move to data-based hvparam checks instead of code
Move more hypervisor strings into constants
watcher: try to restart the master if down
IAllocator: export total disk size for instances
Add -H/-B startup parameters to gnt-instance
call_instance_start: add optional hv/be parameters
Fix gnt-job list argument handling
Instance reinstall: don't mix up errors
Don't check memory at startup if instance is up
2.1 design: add VNC console password changes
2.1 design: OS parameters
Move HVM's device_model to a hypervisor parameter
Implement the KERNEL_PATH parameter for xen-hvm
2.1 design: propose redistribute config changes
gnt-cluster modify: fix --no-lvm-storage
LUSetClusterParams: improve volume group removal
gnt-cluster info: show more cluster parameters
LUQueryClusterInfo: return a few more fields
...
Conflicts:
lib/constants.py (just some additions of new parameters
in both branches, fixed)
Signed-off-by: Iustin Pop <iustin@google.com>
Files
- added
- modified
- copied
- renamed
- deleted