Merge branch 'rc' into dev

This commit is contained in:
Paulus Schoutsen 2018-03-25 18:25:25 -07:00
commit a08e5efe53
4 changed files with 5 additions and 5 deletions

View File

@ -24,7 +24,7 @@ from homeassistant.core import callback
from homeassistant.helpers.translation import async_get_translations from homeassistant.helpers.translation import async_get_translations
from homeassistant.loader import bind_hass from homeassistant.loader import bind_hass
REQUIREMENTS = ['home-assistant-frontend==20180322.0'] REQUIREMENTS = ['home-assistant-frontend==20180326.0']
DOMAIN = 'frontend' DOMAIN = 'frontend'
DEPENDENCIES = ['api', 'websocket_api', 'http', 'system_log'] DEPENDENCIES = ['api', 'websocket_api', 'http', 'system_log']

View File

@ -356,7 +356,7 @@ hipnotify==1.0.8
holidays==0.9.4 holidays==0.9.4
# homeassistant.components.frontend # homeassistant.components.frontend
home-assistant-frontend==20180322.0 home-assistant-frontend==20180326.0
# homeassistant.components.homematicip_cloud # homeassistant.components.homematicip_cloud
homematicip==0.8 homematicip==0.8

View File

@ -81,7 +81,7 @@ hbmqtt==0.9.1
holidays==0.9.4 holidays==0.9.4
# homeassistant.components.frontend # homeassistant.components.frontend
home-assistant-frontend==20180322.0 home-assistant-frontend==20180326.0
# homeassistant.components.influxdb # homeassistant.components.influxdb
# homeassistant.components.sensor.influxdb # homeassistant.components.sensor.influxdb

View File

@ -21,9 +21,9 @@ fi
CURRENT_BRANCH=`git rev-parse --abbrev-ref HEAD` CURRENT_BRANCH=`git rev-parse --abbrev-ref HEAD`
if [ "$CURRENT_BRANCH" != "master" ] if [ "$CURRENT_BRANCH" != "master" ] && [ "$CURRENT_BRANCH" != "rc" ]
then then
echo "You have to be on the master branch to release." echo "You have to be on the master or rc branch to release."
exit 1 exit 1
fi fi