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.

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

Added Hive Water Heater #9856

Merged
merged 7 commits into from Jul 16, 2019

Conversation

@KJonline
Copy link
Contributor

commented Jul 14, 2019

Description:

Add Hive water heater documentation for the hive hot water function.

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

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.

@klaasnicolaas

This comment has been minimized.

Copy link
Contributor

commented Jul 14, 2019

Please merge the 2 files into the hive.markdown file. But first make sure you have an upstream set and pull the latest version of the upstream branch (home-assistant.io) to get your own fork up to date. I see that your fork comes from January.

@klaasnicolaas klaasnicolaas added this to To Do in New documentation via automation Jul 14, 2019

@klaasnicolaas klaasnicolaas moved this from To Do to In Progress in New documentation Jul 14, 2019

@frenck frenck added this to the 0.96 milestone Jul 15, 2019

@frenck frenck moved this from In Progress to Parent Merged in New documentation Jul 15, 2019

KJonline added 2 commits Jul 15, 2019
Merge branch 'next' of https://github.com/home-assistant/home-assista…
…nt.io into next

* 'next' of https://github.com/home-assistant/home-assistant.io: (1574 commits)
  Add Twente Milieu integration (#9851)
  Add climate services to Homematic IP Cloud (#9832)
  Add documentation for Splunk Component entity filter support (#9831)
  Added config for multiple accounts - N26 (#9577)
  Add Apache Kafka docs (#9836)
  Remove monitored conditions from syncthru (#9825)
  Cleans up front matter (#9835)
  Add WWLLN docs (#9802)
  [Toon] New scan_interval on integration level (#9488)
  Update alexa.smart_home.markdown (#9827)
  Clarify
  media_player volume control (#9829)
  Add marker sensor to CUPS (#9820)
  Updates climate platform docs for Climate 1.0
  Updates Google Assistant for Climate 1.0
  Updates generic_thermostat for Climate 1.0
  Updates KNX for Climate 1.0
  Updates Stiebel Eltron to Climate 1.0
  Updates Ecobee for Climate 1.0
  Updates Radio Thermostat for Climate 1.0
  ...

# Conflicts:
#	source/_components/climate.hive.markdown
@KJonline

This comment has been minimized.

Copy link
Contributor Author

commented Jul 15, 2019

Hi @klaasnicolaas apologies for that, I have pulled from upstream and updated the hive.markdown file.

KJonline and others added 3 commits Jul 15, 2019

@frenck frenck removed the in-progress label Jul 16, 2019

New documentation automation moved this from Parent Merged to Awaiting Parent PR Jul 16, 2019

@frenck
frenck approved these changes Jul 16, 2019
Copy link
Member

left a comment

Thanks for the PR & the quick adjustments @KJonline! 👍

@frenck frenck moved this from Awaiting Parent PR to Parent Merged in New documentation Jul 16, 2019

@frenck frenck merged commit 9297aa3 into home-assistant:next Jul 16, 2019

2 checks passed

Gitpod Open a prebuilt online workspace in Gitpod
Details
deploy/netlify Deploy preview ready!
Details

New documentation automation moved this from Parent Merged to Done Jul 16, 2019

@frenck frenck removed the needs-rebase label Jul 16, 2019

@frenck frenck removed the parent-merged label Jul 16, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
3 participants
You can’t perform that action at this time.