Skip to content
Snippets Groups Projects
Commit 30198f04 authored by Iustin Pop's avatar Iustin Pop
Browse files

Merge remote branch 'devel-2.1'


* devel-2.1:
  Update import documentation for the recent changes
  Add a identify-defaults options for import
  Fix create/import verification of hvparams
  objects.Cluster: add method to get hv defaults
  Reuse NIC information from export
  Reuse backend parameters from export
  Reuse disk information from export
  Reuse hypervisor parameters in import
  Read disk template from export info
  CreateInstance: separate the reading of the export
  Move code from ExpandNames to CheckPrereq
  CreateInstance: Move some code to CheckArguments
  Export more instance parameters in instance export
  Export the nicparams too during instance export
  Handle errors better for wrong nic_count in export
  QA: Make sure RAPI credentials are setup on cluster init

Conflicts:
	lib/cmdlib.py (strange conflict, HEAD had no changes)

Signed-off-by: default avatarIustin Pop <iustin@google.com>
Reviewed-by: default avatarMichael Hanselmann <hansmi@google.com>
parents e7a25b08 33ea43b6
No related branches found
No related tags found
No related merge requests found
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment