Hunter Trujillo 0d1c416c98 Merge branch 'master' into feature/template-variables ... # Conflicts: # bolt/internal/internal.pb.go # ui/src/CheckSources.js # ui/src/dashboards/actions/index.js # ui/src/dashboards/containers/DashboardPage.js # ui/src/data_explorer/components/Visualization.js # ui/src/shared/components/AutoRefresh.js # ui/src/shared/components/Dropdown.js		2017-04-25 17:08:55 -06:00
..
internal	Merge branch 'master' into feature/template-variables	2017-04-25 17:08:55 -06:00
alerts.go	Update to fix go linter issues	2017-03-06 10:11:52 -06:00
alerts_test.go	Introduce ability to edit a dashboard cell	2017-03-23 17:12:33 -07:00
client.go	Introduce ability to edit a dashboard cell	2017-03-23 17:12:33 -07: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