Merge branch 'master' into release-1.8

2017-08-04 09:17:55 -07:00
parent e8b4d65bbc a29cfd7d0c
commit d6012632b4
14 changed files with 50 additions and 41 deletions
@@ -755,7 +755,7 @@ Here are two approaches for managing this transition:
 Run both the RBAC and ABAC authorizers, and include the legacy ABAC policy:

 ```
--authorization-mode=RBAC,ABAC --authorization-policy-file=mypolicy.jsonl
+--authorization-mode=RBAC,ABAC --authorization-policy-file=mypolicy.json
 ```

 The RBAC authorizer will attempt to authorize requests first. If it denies an API request,