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

[Changelog] Update for Hammer-5 release #939

Merged
merged 1 commit into from
Apr 18, 2019
Merged

Conversation

JPrause
Copy link
Member

@JPrause JPrause commented Apr 17, 2019

[skip ci]

@JPrause
Copy link
Member Author

JPrause commented Apr 17, 2019

@miq-bot add_label documentation

@miq-bot
Copy link
Member

miq-bot commented Apr 17, 2019

Checked commit JPrause@6e4c343 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. ⭐

@miq-bot
Copy link
Member

miq-bot commented Apr 17, 2019

Some comments on commit JPrause@6e4c343

CHANGELOG.md

  • 💣 💥 🔥 🚒 - 42 - Detected cloudforms

@JPrause
Copy link
Member Author

JPrause commented Apr 17, 2019

@miq-bot add_label hammer/yes

@JPrause
Copy link
Member Author

JPrause commented Apr 18, 2019

@mturley as time permits, can you review/merge.

@mturley
Copy link
Contributor

mturley commented Apr 18, 2019

@JPrause, many of these changes (all of the conversion host related changes) are not visible to the user until #922 is released (which enables that feature and was merged today). With the feature disabled, the additions have no effect and the fixes are for issues that were never exposed. Should we still include them here?

@JPrause
Copy link
Member Author

JPrause commented Apr 18, 2019

Hmm. Looking at that PR922,...I see it has the label hammer/yes.
Satoe should backport that PR to the hammer branch, then kick off the hammer-5 build early next week. That means it'd be available.
The upstream changelogs are added to master just before the build is done.
Satoe then cherry-picks to the upstream branch then builds.

However, it's ultimately your call about whether we merge this changelog. I can close this PR if you feel these shouldn't be exposed just yet.

@mturley
Copy link
Contributor

mturley commented Apr 18, 2019

That's fair. I imagine we need to update this changelog just before the build and include #922 as well as anything else merged before the build that isn't already listed (like #941 and #915 and #932).

Sorry we're getting so many things in so close to build time :)

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.

I'll go ahead and merge this, we can always update it later.

@mturley mturley merged commit 2d61f88 into ManageIQ:master Apr 18, 2019
@simaishi
Copy link
Contributor

@JPrause hammer/yes doesn't mean it will be included in the next build (in this case hammer-5). What's included in the hammer branch now is what will be in hammer-5.

@simaishi
Copy link
Contributor

@JPrause please ping me when you have updated changelog PR for hammer-5

simaishi pushed a commit that referenced this pull request Apr 26, 2019
[Changelog] Update for Hammer-5 release

(cherry picked from commit 2d61f88)
@simaishi
Copy link
Contributor

Hammer backport details:

$ git log -1
commit d9c4d70a0b6ef9148d0e273a970930bc07d09aea
Author: Mike Turley <mike.turley@alum.cs.umass.edu>
Date:   Thu Apr 18 15:55:14 2019 -0400

    Merge pull request #939 from JPrause/hammer5_cl
    
    [Changelog] Update for Hammer-5 release
    
    (cherry picked from commit 2d61f8894a1ee455230d0ff6ffc2652893be6ee9)

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants