Skip to content

CoolMaster: Change auto to heat_cool#10209

Merged
klaasnicolaas merged 1 commit into
home-assistant:nextfrom
OnFreund:auto_to_heat_cool
Aug 25, 2019
Merged

CoolMaster: Change auto to heat_cool#10209
klaasnicolaas merged 1 commit into
home-assistant:nextfrom
OnFreund:auto_to_heat_cool

Conversation

@OnFreund
Copy link
Copy Markdown
Contributor

@OnFreund OnFreund commented Aug 22, 2019

Description:

Changing the auto mode to a heat_cool mode in CoolMaster to better reflect what it does.

Pull request in home-assistant (if applicable): home-assistant/core#26144

Checklist:

  • Branch: next is for changes and new documentation that will go public with the next Home Assistant release. Fixes, changes and adjustments for the current release should be created against current.
  • The documentation follows the standards.

@probot-home-assistant probot-home-assistant Bot added has-parent This PR has a parent PR in another repo next This PR goes into the next branch labels Aug 22, 2019
@klaasnicolaas klaasnicolaas added the ready-for-review This PR needs to be reviewed label Aug 22, 2019
frenck
frenck previously approved these changes Aug 23, 2019
Copy link
Copy Markdown
Member

@frenck frenck left a comment

Choose a reason for hiding this comment

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

✅ Approved. Can be merged as soon as the parent PR gets merged.

@frenck frenck added awaits-parent Awaits the merge of an parent PR and removed ready-for-review This PR needs to be reviewed labels Aug 23, 2019
@probot-home-assistant probot-home-assistant Bot added the parent-merged The parent PR has been merged already label Aug 23, 2019
@OnFreund
Copy link
Copy Markdown
Contributor Author

@frenck Thanks. The parent PR is now merged.

@klaasnicolaas klaasnicolaas added this to the 0.98 milestone Aug 23, 2019
klaasnicolaas
klaasnicolaas previously approved these changes Aug 23, 2019
@klaasnicolaas
Copy link
Copy Markdown
Member

Could you resolve the merge conflict? As far as I see, your fork still has an old version of our repo. Make sure that it is up to date.

@OnFreund OnFreund dismissed stale reviews from klaasnicolaas and frenck via 8b00d8d August 24, 2019 08:04
@OnFreund
Copy link
Copy Markdown
Contributor Author

@klaasnicolaas really strange. Not sure how this happened. I rebased on top of upstream/next and should be ok now.

@klaasnicolaas klaasnicolaas removed the awaits-parent Awaits the merge of an parent PR label Aug 25, 2019
@klaasnicolaas
Copy link
Copy Markdown
Member

Yes we can merge now 😄

@klaasnicolaas klaasnicolaas merged commit cdd7ccb into home-assistant:next Aug 25, 2019
@probot-home-assistant probot-home-assistant Bot removed the parent-merged The parent PR has been merged already label Aug 25, 2019
@OnFreund OnFreund deleted the auto_to_heat_cool branch August 27, 2019 05:29
@balloob balloob added the cherry-picked This PR has been manually picked and merged into the current branch label Aug 28, 2019
balloob pushed a commit that referenced this pull request Aug 28, 2019
@bbrendon bbrendon mentioned this pull request Sep 23, 2019
2 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

cherry-picked This PR has been manually picked and merged into the current branch has-parent This PR has a parent PR in another repo next This PR goes into the next branch

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants