Merge branch 'data-source-instance-to-react' of…

Merge branch 'data-source-instance-to-react' of https://github.com/grafana/grafana into data-source-instance-to-react

pkg/models/datasource.go

@@ -196,14 +196,12 @@ type DsPermissionType int
 
 
 const (
 const (
 	DsPermissionQuery DsPermissionType = 1 << iota
 	DsPermissionQuery DsPermissionType = 1 << iota
-	DsPermissionAdmin
 	DsPermissionNoAccess
 	DsPermissionNoAccess
 )
 )
 
 
 func (p DsPermissionType) String() string {
 func (p DsPermissionType) String() string {
 	names := map[int]string{
 	names := map[int]string{
 		int(DsPermissionQuery):    "Query",
 		int(DsPermissionQuery):    "Query",
-		int(DsPermissionAdmin):    "Admin",
 		int(DsPermissionNoAccess): "No Access",
 		int(DsPermissionNoAccess): "No Access",
 	}
 	}
 	return names[int(p)]
 	return names[int(p)]