Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PCI Kubernetes: Get available flavors from API #1781

Merged
merged 2 commits into from
Nov 18, 2019
Merged

Conversation

marie-j
Copy link
Collaborator

@marie-j marie-j commented Nov 14, 2019

@marie-j marie-j changed the title PCI Kubernetes: Get available flavors from APIé PCI Kubernetes: Get available flavors from API Nov 14, 2019
Jisay
Jisay previously approved these changes Nov 14, 2019
@antleblanc
Copy link
Member

@marie-j [email protected] has been released 🎉

antleblanc
antleblanc previously approved these changes Nov 14, 2019
@marie-j marie-j dismissed stale reviews from antleblanc and Jisay via 98017d9 November 14, 2019 16:20
antleblanc
antleblanc previously approved these changes Nov 14, 2019
@antleblanc
Copy link
Member

Hi @marie-j!

Could you please rebase your Pull Request on develop branch? (In conflict due to #1789)

Thanks!

FredericEspiau
FredericEspiau previously approved these changes Nov 18, 2019
packages/manager/apps/carrier-sip/package.json Outdated Show resolved Hide resolved
packages/manager/apps/cloud/package.json Outdated Show resolved Hide resolved
packages/manager/apps/dedicated/package.json Outdated Show resolved Hide resolved
@marie-j
Copy link
Collaborator Author

marie-j commented Nov 18, 2019

Hi @marie-j!

Could you please rebase your Pull Request on develop branch? (In conflict due to #1789)

Thanks!

@antleblanc Done ! I've removed the commit responsible for the bump of ovh-api-services which was the one causing conflicts

@antleblanc antleblanc merged commit 444c53f into develop Nov 18, 2019
@antleblanc antleblanc deleted the feat/pci-kube-i1 branch November 18, 2019 13:26
@antleblanc antleblanc mentioned this pull request Nov 18, 2019
29 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants