Influxdata
/
influxdb
mirror of https://github.com/influxdata/influxdb.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
influxdb/enterprise
History
Jared Scheib 26716ad280 Merge branch 'master' into feature/admin 
Conflicts:
	CHANGELOG.md
	enterprise/users.go
	server/admin.go
	server/admin_test.go
	ui/.eslintrc
	ui/src/shared/constants/index.js
	ui/src/store/configureStore.js
	ui/src/style/theme/theme-dark.scss
 		2017-03-10 18:36:37 -08:00
..
enterprise.go Add ability to update roles on a user resource 2017-03-10 16:52:24 -06:00
enterprise_test.go
…
meta.go Add ability to update roles on a user resource 2017-03-10 16:52:24 -06:00
meta_test.go Add ability to update roles on a user resource 2017-03-10 16:52:24 -06:00
mocks_test.go Add ability to update roles on a user resource 2017-03-10 16:52:24 -06:00
roles.go
…
roles_test.go
…
types.go
…
users.go Merge branch 'master' into feature/admin 2017-03-10 18:36:37 -08:00
users_test.go Add ability to update roles on a user resource 2017-03-10 16:52:24 -06:00