Skip to content

Merge dev to master for release 1.6.0#850

Merged
alexazarh merged 27 commits intomasterfrom
develop
Feb 27, 2017
Merged

Merge dev to master for release 1.6.0#850
alexazarh merged 27 commits intomasterfrom
develop

Conversation

@alexazarh
Copy link
Copy Markdown
Contributor

@alexazarh alexazarh commented Feb 27, 2017

This change is Reviewable

GilGald and others added 27 commits October 19, 2016 15:46
(cherry picked from commit d0ea47b)

# Conflicts:
#	package/cloudshell/cp/vcenter/commands/connect_orchestrator.py
(cherry picked from commit 67b5fa4)

# Conflicts:
#	package/cloudshell/cp/vcenter/common/vcenter/task_waiter.py
…terShell into feature/develop-version-update-to-1-5

# Conflicts:
#	deployment_drivers/deploy_clone_from_vm/drivermetadata.xml
#	deployment_drivers/deploy_from_image/drivermetadata.xml
#	deployment_drivers/deploy_from_linked_clone/drivermetadata.xml
#	deployment_drivers/deploy_from_template/drivermetadata.xml
#	package/cloudshell/cp/vcenter/common/vcenter/task_waiter.py
#	package/version.txt
#	static_vm_package/VCenterAutoloadStaticVMDriver/app_discovery/requirements.txt
#	vcentershell_driver/drivermetadata.xml
#	version.txt
…ate-to-1-5

Feature/develop version update to 1 5
…sion-update-to-1-5"

This reverts commit 2cf0447, reversing
changes made to c0020a6.
…hange_cloudprovider_vm_storage_description

change description of the "VM Storage" attribute
# Conflicts:
#	deployment_drivers/deploy_clone_from_vm/drivermetadata.xml
#	deployment_drivers/deploy_clone_from_vm/requirements.txt
#	deployment_drivers/deploy_from_image/drivermetadata.xml
#	deployment_drivers/deploy_from_image/requirements.txt
#	deployment_drivers/deploy_from_linked_clone/drivermetadata.xml
#	deployment_drivers/deploy_from_linked_clone/requirements.txt
#	deployment_drivers/deploy_from_template/drivermetadata.xml
#	deployment_drivers/deploy_from_template/requirements.txt
#	package/version.txt
#	static_vm_package/VCenterAutoloadStaticVMDriver/app_discovery/requirements.txt
#	vcentershell_driver/drivermetadata.xml
#	vcentershell_driver/requirements.txt
#	version.txt
fixed bug #834 and updated requirements for cloudshell-automation-api
@coveralls
Copy link
Copy Markdown

coveralls commented Feb 27, 2017

Coverage Status

Coverage decreased (-0.2%) to 85.504% when pulling d2a9b21 on develop into 84e786e on master.

@alexazarh
Copy link
Copy Markdown
Contributor Author

Reviewed 54 of 54 files at r1.
Review status: all files reviewed at latest revision, all discussions resolved.


Comments from Reviewable

@alexazarh alexazarh merged commit b0b39fd into master Feb 27, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants