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

Add display name for Amazon Network Router #16912

Merged

Conversation

mzazrivec
Copy link
Contributor

locale/en.yml Outdated
@@ -842,6 +842,7 @@ en:
ManageIQ::Providers::Azure::CloudManager::OrchestrationStack: Orchestration Stack (Microsoft Azure)
ManageIQ::Providers::Amazon::CloudManager::OrchestrationStack: Orchestration Stack (Amazon)
ManageIQ::Providers::Amazon::NetworkManager::NetworkPort: Network Port (Amazon)
ManageIQ::Providers::Amazon::NetworkManager::NetworkRouter: Network Router (Amazon)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would you mind aligning it with the others?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

@mzazrivec mzazrivec force-pushed the add_amazon_network_router_display_name branch from c535a99 to 0f56ddd Compare January 31, 2018 06:46
@miq-bot
Copy link
Member

miq-bot commented Jan 31, 2018

Checked commit mzazrivec@0f56ddd with ruby 2.3.3, rubocop 0.52.0, haml-lint 0.20.0, and yamllint 1.10.0
0 files checked, 0 offenses detected
Everything looks fine. 🍪

@bdunne bdunne merged commit e87d5b4 into ManageIQ:master Jan 31, 2018
@mzazrivec mzazrivec deleted the add_amazon_network_router_display_name branch January 31, 2018 12:29
@agrare agrare added this to the Sprint 79 Ending Feb 12, 2018 milestone Feb 23, 2018
simaishi pushed a commit that referenced this pull request Mar 6, 2018
…splay_name

Add display name for Amazon Network Router
(cherry picked from commit e87d5b4)

https://bugzilla.redhat.com/show_bug.cgi?id=1552269
@simaishi
Copy link
Contributor

simaishi commented Mar 6, 2018

Gaprindashvili backport details:

$ git log -1
commit d7fee09809fccce89133da83e475851c64b3dfe0
Author: Brandon Dunne <brandondunne@hotmail.com>
Date:   Wed Jan 31 07:25:43 2018 -0500

    Merge pull request #16912 from mzazrivec/add_amazon_network_router_display_name
    
    Add display name for Amazon Network Router
    (cherry picked from commit e87d5b4d01a3d5ecc463d2616165d7a24b9240b4)
    
    https://bugzilla.redhat.com/show_bug.cgi?id=1552269

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.

5 participants