Merge remote-tracking branch 'origin/current' into next

This commit is contained in:
Paulus Schoutsen 2016-12-03 08:26:21 -08:00
commit 5b26218cc6
3 changed files with 13 additions and 11 deletions

View File

@ -133,6 +133,7 @@ current_major_version: 0
current_minor_version: 34 current_minor_version: 34
current_patch_version: 0 current_patch_version: 0
date_released: 2016-12-03 date_released: 2016-12-03
# Either # or the anchor link to latest release notes in the blog post. # Either # or the anchor link to latest release notes in the blog post.
# Must be prefixed with a # and have double quotes around it. # Must be prefixed with a # and have double quotes around it.
patch_version_notes: "#release-0334---november-24" patch_version_notes: "#"

View File

@ -38,6 +38,7 @@ The following conditions can be monitored with a Nest Thermostat or Protect.
- 'battery_level' - 'battery_level'
The following conditions can be monitored with a Nest Thermostat only. The following conditions can be monitored with a Nest Thermostat only.
- 'temperature' - 'temperature'
- 'target' - 'target'
- 'humidity' - 'humidity'

View File

@ -43,8 +43,8 @@ automation:
service: media_player.play_media service: media_player.play_media
data: data:
entity_id: media_player.nursery entity_id: media_player.nursery
media_id: http://fileserver/rain.mp3 media_content_id: http://fileserver/rain.mp3
media_type: audio/mp4 media_content_type: audio/mp4
# If you select "Babbling Brook", play the "babbling_brook.mp3" file # If you select "Babbling Brook", play the "babbling_brook.mp3" file
@ -59,8 +59,8 @@ automation:
service: media_player.play_media service: media_player.play_media
data: data:
entity_id: media_player.nursery entity_id: media_player.nursery
media_id: http://fileserver/babbling_brook.mp3 media_content_id: http://fileserver/babbling_brook.mp3
media_type: audio/mp4 media_content_type: audio/mp4
# If you select "None, turn the Chromecast off # If you select "None, turn the Chromecast off
- alias: Stop the Lullaby - alias: Stop the Lullaby