Jason Wilder ca06755422 Fix merge breakage		2016-01-24 22:00:51 -07:00
..
config.go	Add continuous query option for customizing resampling	2015-12-28 16:43:49 -05:00
config_test.go	Add continuous query option for customizing resampling	2015-12-28 16:43:49 -05:00
continuous_queries.md	making queries syntactically correct	2015-07-08 17:25:56 -06:00
service.go	Merge pull request #5403 from influxdata/meta-service2	2016-01-22 20:06:51 -05:00
service_test.go	Fix merge breakage	2016-01-24 22:00:51 -07:00