Merge branch 'master' into facts

2017-06-10 03:40:13 -04:00
parent d2c47df31f 26825aee4f
commit 7cd8908adb
14 changed files with 161 additions and 75 deletions
--- a/test/test_app.py
+++ b/test/test_app.py
@@ -820,4 +820,4 @@ def test_node_facts_json(client, mocker,
    for line in result_json['data']:
        assert len(line) == 2

-    assert 'chart' not in result_json
+    assert 'chart' not in result_json