tree 53b301035a7e51a03f431c5f5c53593030b58638
parent 34d1754a7a12ade6191c0ed4d2ced547e0b4f482
parent fcecf19f1bd525a647214a4724eff5a06c1f6d5e
author Filip Pytloun <fpytloun@mirantis.com> 1494948911 +0000
committer Gerrit Code Review <gerrit2@5776b83a74fe> 1494948911 +0000

Merge changes from topic '3939'

* changes:
  Add support of Keystone OIDC Federation
  Rename  websso to federation