Added support for adding LDAP certificate location to Zabbix Web. Upd… #150
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ated documentation to reflect change. NOTE: This change does not enable LDAP, this still needs to be implemented
Closed
|
I would like to merge this, but it seems that there are some conflicts. If you could take a look at this that I can merge this request. Looks very good. |
|
I'm a bit confused as to why. I made a fork of master, made my changes to the fork, commited/pushed, then made the pull request. Is there a way to tell what is conflicting and why? Not sure what could cause it. |
|
Hopped on IRC and read some docs. You can now merge this request automatically! |
dj-wasabi
added a commit
that referenced
this pull request
Jan 28, 2016
Added support for adding LDAP certificate location to Zabbix Web. Upd…
|
Thanks!! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
…ated documentation to reflect change. NOTE: This change does not enable LDAP. This must be done in the Zabbix GUI. Puppet management of still needs to be implemented