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

Daikin documentation for 0.91 #9134

Merged
merged 5 commits into from
Apr 28, 2019
Merged

Daikin documentation for 0.91 #9134

merged 5 commits into from
Apr 28, 2019

Conversation

fredrike
Copy link
Contributor

@fredrike fredrike commented Apr 4, 2019 •
edited
Loading

Description:

The Daikin documentation in the next branch contains merge conflicts (#9133), this fixes that.

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.

@ghost ghost added the to-do label Apr 4, 2019
@frenck frenck added current This PR goes into the current branch has-parent This PR has a parent PR in a other repo new-feature This PR adds documentation for a new Home Assistant feature to an existing integration and removed to-do labels Apr 4, 2019
@frenck frenck self-assigned this Apr 4, 2019
@frenck frenck self-requested a review April 4, 2019 11:14
@frenck
Copy link
Member

frenck commented Apr 4, 2019

uuh this feels weird, let me check what happened here.

@frenck frenck mentioned this pull request Apr 4, 2019
Closed
@frenck
Copy link
Member

frenck commented Apr 4, 2019

See issue you've raised for more details: #9133

IMHO, we should not merge this, and cherry-pick #9033 to current instead.

@fredrike
Copy link
Contributor Author

fredrike commented Apr 4, 2019 •
edited
Loading

e28e665 is the cherry pick of #9033 and 0592602 is a better rewrite considering the changes in 17707ae (#9100).

@ghost ghost added the to-do label Apr 4, 2019
@fredrike
Copy link
Contributor Author

fredrike commented Apr 10, 2019 •
edited
Loading

@frenck, What is the status on this? As far as I see is #9033 not merged to current.

@fredrike fredrike mentioned this pull request Apr 15, 2019
Merged
10 tasks
klaasnicolaas
klaasnicolaas previously approved these changes Apr 28, 2019
View reviewed changes
@klaasnicolaas klaasnicolaas merged commit ea94883 into home-assistant:current Apr 28, 2019
@fredrike fredrike deleted the daikin-0.91 branch April 29, 2019 05:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@klaasnicolaas klaasnicolaas klaasnicolaas approved these changes

@frenck frenck Awaiting requested review from frenck

Assignees

@frenck frenck

Labels
current This PR goes into the current branch has-parent This PR has a parent PR in a other repo new-feature This PR adds documentation for a new Home Assistant feature to an existing integration
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@fredrike @frenck @klaasnicolaas