Hunter Trujillo 57bf5f571a Merge branch 'master' into http-tcp ... # Conflicts: # CHANGELOG.md		2017-02-10 13:31:01 -07:00
..
data_explorer	…
kapacitor/reducers	Refactor parseAlerta spec to test reducer, accessors, and parser separately. Refactor parseAlerta out of rules reducer into its own file in shared/prasing. Update appearance of AlertaConfig. Update appearance of RuleMessage input field. Remove smtp and alerta from default alerts.	2017-02-10 13:03:31 -07:00
shared	Refactor parseAlerta spec to test reducer, accessors, and parser separately. Refactor parseAlerta out of rules reducer into its own file in shared/prasing. Update appearance of AlertaConfig. Update appearance of RuleMessage input field. Remove smtp and alerta from default alerts.	2017-02-10 13:03:31 -07:00
utils	…
index.js	…
spec-helper.js	…