Merge remote-tracking branch 'origin/master' into dev

homeassistant/components/device_tracker/ubus.py

@@ -80,7 +80,7 @@ class UbusDeviceScanner(DeviceScanner):
         return self.last_results
 
     @_refresh_on_acccess_denied
-    def get_device_name(self, device):
+    def get_device_name(self, mac):
         """Return the name of the given device or None if we don't know."""
         if self.leasefile is None:
             result = _req_json_rpc(
@@ -105,7 +105,7 @@ class UbusDeviceScanner(DeviceScanner):
                 # Error, handled in the _req_json_rpc
                 return
 
-        return self.mac2name.get(device.upper(), None)
+        return self.mac2name.get(mac.upper(), None)
 
     @_refresh_on_acccess_denied
     def _update_info(self):

homeassistant/components/frontend/version.py

@@ -3,7 +3,7 @@
 FINGERPRINTS = {
     "compatibility.js": "8e4c44b5f4288cc48ec1ba94a9bec812",
     "core.js": "d4a7cb8c80c62b536764e0e81385f6aa",
-    "frontend.html": "c44e49b9a0d9b9e4a626b7af34ca97d0",
+    "frontend.html": "7d599996578579600f1000d6d25e649d",
     "mdi.html": "e91f61a039ed0a9936e7ee5360da3870",
     "micromarkdown-js.html": "93b5ec4016f0bba585521cf4d18dec1a",
     "panels/ha-panel-automation.html": "1982116c49ad26ee8d89295edc797084",
@@ -19,6 +19,6 @@ FINGERPRINTS = {
     "panels/ha-panel-kiosk.html": "2ac2df41bd447600692a0054892fc094",
     "panels/ha-panel-logbook.html": "7c45bd41c146ec38b9938b8a5188bb0d",
     "panels/ha-panel-map.html": "50501cd53eb4304e9e46eb719aa894b7",
-    "panels/ha-panel-shopping-list.html": "c04af28c6475b90cbf2cf63ba1b841d0",
+    "panels/ha-panel-shopping-list.html": "1d7126efc9ff9a102df7465d803a11d1",
     "panels/ha-panel-zwave.html": "422f95f820f8b6b231265351ffcf4dd1"
 }

homeassistant/const.py

@@ -2,7 +2,7 @@
 """Constants used by Home Assistant components."""
 MAJOR_VERSION = 0
 MINOR_VERSION = 50
-PATCH_VERSION = '0.dev0'
+PATCH_VERSION = '0'
 __short_version__ = '{}.{}'.format(MAJOR_VERSION, MINOR_VERSION)
 __version__ = '{}.{}'.format(__short_version__, PATCH_VERSION)
 REQUIRED_PYTHON_VER = (3, 4, 2)