Merge branch 'hotfix/state-as-number' into dev

Conflicts:
	homeassistant/const.py
	tests/helpers/test_state.py
This commit is contained in:
Paulus Schoutsen committed 2016-02-13 08:32:06 -08:00
commit bf0b453677
12 files changed
+22 -37

No files matched your search

+1
View File
@@ -89,6 +89,7 @@ class TestGraphite(unittest.TestCase):
'bat': 'NaN',
}
expected = [
'ha.entity.state 0.000000 12345',
'ha.entity.foo 1.000000 12345',
'ha.entity.bar 2.000000 12345',
'ha.entity.baz 1.000000 12345',