chronograf/server
Tim Raymond 63cddc96e4 Merge branch 'master' into feature/1602-graph-bounds-setting
Also removed LegacyBounds marshaling since it was no longer necessary

Conflicts resolved:
	bolt/internal/internal.go
	bolt/internal/internal.pb.go
	bolt/internal/internal.proto
	bolt/internal/internal_test.go
	chronograf.go
	server/cells_test.go
	server/dashboards_test.go
	server/swagger.json
2017-08-02 11:29:29 -04:00
..
assets.go
auth.go
auth_test.go
builders.go
builders_test.go
cells.go Fix data races in dashboard response construction 2017-07-31 16:36:20 -04:00
cells_test.go Ensure cell bounds come back as empty array 2017-07-31 16:36:16 -04:00
dashboards.go Copy missing properties from Dashboards 2017-07-31 17:24:43 -04:00
dashboards_test.go Add Label to DashboardCell Axis 2017-08-02 11:12:47 -04:00
databases.go
databases_test.go
hsts.go
influx.go Update influx Authorization Headers for write and query path 2017-07-25 12:13:46 -05:00
kapacitors.go
kapacitors_test.go
layout.go
layout_test.go
links.go Conserve memory allocation for customLinks slice 2017-06-27 12:00:05 -07:00
links_test.go Clarify error output for missing Name or URL 2017-06-27 13:40:26 -07:00
logger.go
logout.go
mappings.go
me.go
me_test.go
mountable_router.go
mountable_router_test.go
mux.go
path.go
permissions.go
permissions_test.go
prefixing_redirector.go
prefixing_redirector_test.go
proxy.go
queries.go
queryconfig.go
redoc.go
roles.go
roles_test.go
routes.go
routes_test.go
server.go Clarify BoltPath server flag help text with default path 2017-07-21 11:41:54 -07:00
service.go Add JWT shared secret influxdb auth 2017-07-19 01:39:06 -05:00
sources.go Add JWT shared secret influxdb auth 2017-07-19 01:39:06 -05:00
sources_test.go Add JWT shared secret influxdb auth 2017-07-19 01:39:06 -05:00
swagger.go
swagger.json Release 1.3.5.0 2017-07-25 15:08:02 -05:00
templates.go
templates_test.go
url_prefixer.go
url_prefixer_test.go Add test for creating NewSources via server flag 2017-07-07 12:56:12 -07:00
users.go
users_test.go
version.go