Andrew Watkins 92bd5d10b4 Resolve conflicts ... Conflicts: ui/src/utils/influxql.js		2017-05-05 10:01:26 -07:00
..
internal	Fix Go compiled file.	2017-04-26 15:29:20 -06:00
client.go	Update kapacitors rule's to use AST and kapacitor directly	2017-04-05 20:04:42 -05:00
client_test.go	Update name to chronograf	2016-10-20 09:39:40 -05:00
dashboards.go	Introduce ability to edit a dashboard cell	2017-03-23 17:12:33 -07:00
layouts.go	Update to fix go linter issues	2017-03-06 10:11:52 -06:00
servers.go	DRY bolt/servers.go code	2017-04-21 13:07:32 -07:00
servers_test.go	persist the currently active kapacitor in boltdb	2017-04-21 12:42:35 -07:00
sources.go	Update to fix go linter issues	2017-03-06 10:11:52 -06:00
sources_test.go	Introduce ability to edit a dashboard cell	2017-03-23 17:12:33 -07:00
users.go	Add tests for bolt user store	2017-02-21 22:15:22 -06:00
users_test.go	Introduce ability to edit a dashboard cell	2017-03-23 17:12:33 -07:00
util.go	Refactor users and add client usersstore	2017-02-17 13:37:00 -06:00