Commit Graph

3 Commits (278579d63125dadb6a2efc5c397b5724a6c28a0a)

Author SHA1 Message Date
Chris Goller f60a358751 Merge branch 'master' into feature/#54-tr-enterprise-client
Conflicts:
	Makefile
	chronograf.go
	server/routes.go
	server/users.go
2017-02-23 23:26:09 -06:00
Chris Goller 08271f25ef Add roles to chronograf 2017-02-23 16:02:53 -06:00
Chris Goller de7d01fe06 Add tests for /me endpoint 2017-02-21 21:36:23 -06:00