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.

Sign up for GitHub

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

Jump to bottom

Fix the external db template after merging #207 #269

Merged
merged 7 commits into from
Feb 20, 2018
Merged

Fix the external db template after merging #207 #269

merged 7 commits into from
Feb 20, 2018

Conversation

carbonin
Copy link
Member

@carbonin carbonin commented Feb 19, 2018 •
edited
Loading

Missed these in #207

@bdunne
Copy link
Member

bdunne commented Feb 19, 2018

Can you sync up the two templates? There are other things that are not the same. It's hard to compare in a diff viewer

@carbonin
Copy link
Member Author

Yeah, noticed that too @bdunne. Wasn't sure if I should do that as a separate PR or a separate commit in this one.

@bdunne
Copy link
Member

bdunne commented Feb 20, 2018

Yeah, multiple commits in one PR would probably be best.

@carbonin carbonin changed the title Add the orchestrator to the external db template Fix the external db template after merging #207 Feb 20, 2018
@carbonin
Copy link
Member Author

Expanded the scope of this PR to include other miscellaneous fixes to the templates caused by the previous changes.

Now you should be able to diff the two templates and only see database-related objects

@carbonin
Copy link
Member Author

Also because I reordered the object list reviewing commit-by-commit is strongly recommended 😄

@miq-bot
Copy link
Member

miq-bot commented Feb 20, 2018

Checked commits carbonin/manageiq-pods@5bb6260~...a70037e with ruby 2.3.3, rubocop 0.52.0, haml-lint 0.20.0, and yamllint 1.10.0
2 files checked, 1 offense detected

**

  • 💣 💥 🔥 🚒 - Linter/Yaml - missing config files

bdunne
bdunne approved these changes Feb 20, 2018
View reviewed changes
Copy link
Member

@bdunne bdunne left a comment

Choose a reason for hiding this comment

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

👍

@bdunne bdunne merged commit 9af86b4 into ManageIQ:master Feb 20, 2018
@bdunne bdunne added this to the Sprint 80 Ending Feb 26, 2018 milestone Feb 20, 2018
@carbonin carbonin deleted the add_orchestrator_to_ext_db_template branch April 7, 2020 14:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bdunne bdunne bdunne approved these changes

Assignees

@bdunne bdunne

Labels
bug template
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@carbonin @bdunne @miq-bot