Skip to content
This repository has been archived by the owner on Mar 25, 2023. It is now read-only.

feat(disk-offering): show all disk offerings when creating a data disk #1405

Merged
merged 40 commits into from
Nov 8, 2018

Conversation

wowshakhov
Copy link
Collaborator

@wowshakhov wowshakhov commented Nov 8, 2018

Previous PR: #1296

…k and show error message when chosen disk offering don't fit account resource limitations
# Conflicts:
#	src/app/shared/components/disk-offering/disk-offering-dialog/disk-offering-dialog.component.ts
# Conflicts:
#	src/app/shared/components/disk-offering/disk-offering-dialog/disk-offering-dialog.component.ts
#	src/app/shared/components/disk-offering/disk-offering-selector/disk-offering-selector.component.ts
#	src/app/volume/container/volume-creation.container.ts
#	src/app/volume/volume-creation/volume-creation-dialog.component.html
#	src/app/volume/volume-creation/volume-creation-dialog.component.ts
#	src/i18n/en.json
#	src/i18n/ru.json
# Conflicts:
#	src/app/shared/actions/volume-actions/volume-resize/volume-resize.component.html
#	src/app/volume/container/volume-creation.container.ts
# Conflicts:
#	src/app/shared/actions/volume-actions/volume-resize.container.ts
#	src/app/vm/vm-creation/vm-creation.component.html
#	src/app/vm/vm-creation/vm-creation.component.ts
# Conflicts:
#	src/app/shared/actions/volume-actions/volume-resize/volume-resize.component.html
#	src/app/shared/actions/volume-actions/volume-resize/volume-resize.component.ts
#	src/app/shared/components/disk-offering/disk-offering-dialog/disk-offering-dialog.component.spec.ts
#	src/app/shared/components/disk-offering/disk-offering-selector/disk-offering-selector.component.ts
#	src/app/vm/vm-creation/vm-creation.component.ts
#	src/app/volume/container/volume-creation.container.ts
#	src/app/volume/volume-creation/volume-creation-dialog.component.html
#	src/app/volume/volume-creation/volume-creation-dialog.component.ts
# Conflicts:
#	src/app/core/core.module.ts
#	src/app/home/home.component.ts
HeyRoach and others added 10 commits October 30, 2018 13:23
@coveralls
Copy link

@wowshakhov wowshakhov merged commit 16671e6 into bwsw:master Nov 8, 2018
@wowshakhov wowshakhov deleted the 1242-disk-offering branch November 8, 2018 06:24
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants