12 Commits

Author	SHA1	Message	Date
Torkel Ödegaard	8a95c563bb	Merge branch 'master' into websocket	2017-01-31 08:56:49 +01:00
Mitsuhiro Tanda	7e4c101d02	S3 IAM support (#7058) ... * add s3 dependencly * rewrite image uploader by aws-sdk-go * improve backward compatibility of s3 image uploading * set default for expires option * remove acl and expires	2017-01-11 14:00:49 +01:00
Torkel Ödegaard	e81e4ad06f	updated websocket lib	2016-12-20 11:36:11 +01:00
bergquist	362162d6fa	feat(mqe): add token cache	2016-12-13 14:01:48 +01:00
Mitsuhiro Tanda	51f80affe3	(cloudwatch) update aws-sdk-go to v1.5.8 (#6658) ... * (cloudwatch) upgrade aws-sdk-go v1.5.8 * (cloudwatch) remove non-required aws-sdk-go part * add go-ini	2016-11-22 13:38:11 +01:00
Peter Dave Hello	bf4c3f3ae6	optimize png images using zopflipng (#6197)	2016-10-05 15:57:50 +02:00
bergquist	d711c0ed35	Merge branch 'master' into alert_prometheus	2016-09-22 19:27:24 +02:00
bergquist	43d8bd5a25	feat(prometheus): initial support for prometheus	2016-09-21 07:01:53 +02:00
bergquist	87be56a4f0	fix: add goconvey to vendor	2016-09-19 16:22:39 +02:00
bergquist	3f00834f25	tech: remove unused dependencies	2016-09-19 15:21:53 +02:00
bergquist	3c92f78ee7	feat(cli): add grafana version header to all request against grafana.net	2016-09-15 16:01:06 +02:00
bergquist	6253476c73	tech(build): move dependencies to vendor folder	2016-09-14 16:14:27 +02:00