Merge branch 'master' of git.corp.cloudwatt.com:nassim.babaci/swiftpolicy

Conflicts:
	README.md
This commit is contained in:
Nassim Babaci 2014-07-21 13:39:07 +02:00
commit 68fa65dfe9

View File

@ -44,7 +44,7 @@ Policy file
-----------
The policy file will list all possible actions on swift proxy.
Action's format is: <http verbe>_<swift entity>" (example: "get_container", "put_object", etc).
Action's format is: ``<http verbe>_<swift entity>`` (example: "get_container", "put_object", etc).
...
"get_container": "rule:allowed_for_user",
@ -84,4 +84,3 @@ Limitations
* swiftpolicy does not support dynamic reload of policies, and thus, swift proxy have
to be restarted when policy file is updated.