Skip to content
This repository has been archived by the owner on Sep 5, 2024. It is now read-only.

[Changelog] Removing PRs from changelog #946

Merged
merged 1 commit into from
Apr 26, 2019
Merged

[Changelog] Removing PRs from changelog #946

merged 1 commit into from
Apr 26, 2019

Conversation

JPrause
Copy link
Member

@JPrause JPrause commented Apr 25, 2019 •
edited by simaishi
Loading

Follow-up for #939

[skip ci]

@JPrause
Copy link
Member Author

JPrause commented Apr 25, 2019

@miq-bot add_label documentation

@JPrause
Copy link
Member Author

JPrause commented Apr 25, 2019

@miq-bot add_label hammer/yes

@JPrause
Copy link
Member Author

JPrause commented Apr 25, 2019

@simaishi FYI

@simaishi
Copy link
Contributor

simaishi commented Apr 25, 2019 •
edited
Loading

@JPrause You're doing the other way around... we should be removing some PRs from the original Hammer-5 changelog. What @mturley said here...

@mturley
Copy link
Contributor

mturley commented Apr 25, 2019

I think we should mention that the conversion hosts settings feature was added, even though we shouldn't show all these intermediate steps towards adding it. @JPrause maybe we can add a line to the changelog linking to #922 but instead of saying "Enable (un-hide)" we should just call it "Add Conversion Hosts tab to Settings page". I'll put links to the relevant PRs in that PR for anyone curious enough to click through.

Sorry for the extra churn :) I'll start using changelog/yes and changelog/no in the future.

@simaishi
Copy link
Contributor

we can add a line to the changelog linking to #922 but instead of saying "Enable (un-hide)" we should just call it "Add Conversion Hosts tab to Settings page"

True, but either way, that's for hammer-6!

@mturley
Copy link
Contributor

mturley commented Apr 25, 2019

Oh right! Duh. Ignore me.

@simaishi
Copy link
Contributor

@JPrause Anything that was backported this week shouldn't be included, so you can drop the first commit be458d8 from this PR.

@mturley Can you please review the rest of the changes (the removed PRs)?

@simaishi simaishi requested a review from mturley April 25, 2019 21:34
@JPrause JPrause force-pushed the hammer5.1_cl branch 2 times, most recently from 940b1a0 to fb5bfff Compare April 26, 2019 12:40
@JPrause JPrause changed the title [Changelog] Add missing PRs [Changelog] Add missing PRs to changelog Apr 26, 2019
mturley
mturley reviewed Apr 26, 2019
View reviewed changes
Copy link
Contributor

@mturley mturley left a comment

Choose a reason for hiding this comment

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

One thing I missed before, everything else looks good.

CHANGELOG.md Outdated
@@ -8,41 +8,21 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
## Hammer-5

### Added
- Use conversion_hosts API for RHV target cluster warnings instead of host CF tags [(#847)](https://github.com/ManageIQ/manageiq-v2v/pull/847)
Copy link
Contributor

Choose a reason for hiding this comment

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

This one can stay in, it's not related to the new Conversion Host Enablement settings. I think it's the only conversion host related PR that should stay.

@simaishi
Copy link
Contributor

@JPrause Please fix the PR title as well as the git commit message as this PR isn't "adding missing PRs" but "removing extra PRs" 😄

@JPrause JPrause changed the title [Changelog] Add missing PRs to changelog [Changelog] Removing PRs from changelog Apr 26, 2019
@JPrause
[Changelog] Removing PRs from changlog
bd6b3c4 
[skip ci]

Further edits to remove conversion hosts info

Remove PRs as requested

[Changelog] Removing extra PRs from changelog

[skip ci]
@miq-bot
Copy link
Member

miq-bot commented Apr 26, 2019

Checked commit JPrause@bd6b3c4 with ruby 2.3.3, rubocop 0.52.1, haml-lint 0.20.0, and yamllint 1.10.0
0 files checked, 0 offenses detected
Everything looks fine. ⭐

mturley
mturley approved these changes Apr 26, 2019
View reviewed changes
Copy link
Contributor

@mturley mturley left a comment

Choose a reason for hiding this comment

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

👍 thanks, sorry for the churn

@mturley mturley merged commit a031eea into ManageIQ:master Apr 26, 2019
@JPrause
Copy link
Member Author

JPrause commented Apr 26, 2019

No worries,...although I've been having git rebase nightmares the past few nights. 👍

simaishi pushed a commit that referenced this pull request Apr 26, 2019
@mturley @simaishi
Merge pull request #946 from JPrause/hammer5.1_cl
5a839aa 
[Changelog] Removing PRs from changelog

(cherry picked from commit a031eea)
@simaishi
Copy link
Contributor

Hammer backport details:

$ git log -1
commit 5a839aad6f9bc00693da7e72232f084c57a4e35f
Author: Mike Turley <mike.turley@alum.cs.umass.edu>
Date:   Fri Apr 26 13:54:29 2019 -0400

    Merge pull request #946 from JPrause/hammer5.1_cl
    
    [Changelog] Removing PRs from changelog
    
    (cherry picked from commit a031eea9a38d2390436de1c227d3bf66296a733b)

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@mturley mturley mturley approved these changes

Assignees
No one assigned
Labels
documentation hammer/backported
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@JPrause @simaishi @mturley @miq-bot