Basic Auth now supports LDAP username and password #6940

Merged
merged 1 commit into from Dec 13, 2016

Projects

None yet

2 participants

@utkarshcmu
Contributor

Resolves #6911

@utkarshcmu utkarshcmu Basic Auth now supports LDAP username and password
c1787e5
@torkelo
Member
torkelo commented Dec 13, 2016

Regarding global admin key, absolutely. Defined in config file?

@torkelo torkelo merged commit 5777f65 into grafana:master Dec 13, 2016

1 of 2 checks passed

ci/circleci Your tests failed on CircleCI
Details
licence/cla Contributor License Agreement is signed.
Details
@torkelo torkelo added a commit that referenced this pull request Dec 13, 2016
@torkelo torkelo docs(): updated changelog with PR #6940 62d18cd
@utkarshcmu utkarshcmu deleted the utkarshcmu:basic_auth_ldap branch Dec 13, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment