New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added support for adding LDAP certificate location to Zabbix Web. Upd… #150

Merged
merged 2 commits into from Jan 28, 2016

Conversation

Projects
None yet
2 participants
@rtizzy
Copy link
Contributor

rtizzy commented Jan 27, 2016

…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

Robert T
Added support for adding LDAP certificate location to Zabbix Web. Upd…
…ated documentation to reflect change. NOTE: This change does not enable LDAP, this still needs to be implemented

@rtizzy rtizzy referenced this pull request Jan 27, 2016

Closed

No LDAP Support #149

@dj-wasabi

This comment has been minimized.

Copy link
Collaborator

dj-wasabi commented Jan 28, 2016

@elricsfate

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.

@rtizzy

This comment has been minimized.

Copy link
Contributor

rtizzy commented Jan 28, 2016

@dj-wasabi

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.

@rtizzy

This comment has been minimized.

Copy link
Contributor

rtizzy commented Jan 28, 2016

@dj-wasabi

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

Merge pull request #150 from elricsfate/master
Added support for adding LDAP certificate location to Zabbix Web. Upd…

@dj-wasabi dj-wasabi merged commit 33c5668 into voxpupuli:master Jan 28, 2016

@dj-wasabi

This comment has been minimized.

Copy link
Collaborator

dj-wasabi commented Jan 28, 2016

Thanks!!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment