Skip to content
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

Add Zabbix 4.0 compatibility and new config_mode parameter #548

Merged
merged 4 commits into from
Oct 14, 2018

Conversation

Lord-Y
Copy link
Contributor

@Lord-Y Lord-Y commented Oct 10, 2018

Small updates to add Zabbix 4.0 compatibility

@Lord-Y
Copy link
Contributor Author

Lord-Y commented Oct 10, 2018

@bastelfreak @dj-wasabi Any idea on the CI issue? The error is not explicit at all.

@alexjfisher
Copy link
Member

Looks like the travis job had hung. I restarted it and all looks good now.

@alexjfisher
Copy link
Member

The config_mode parameter change looks unrelated to Zabbix 4. Could it be put into a separate PR please?

@Lord-Y
Copy link
Contributor Author

Lord-Y commented Oct 10, 2018

@alexjfisher Yeah not related but when I try to do my PR, I got a conflict because of that so I have to solve it by merging with the new values.

@alexjfisher
Copy link
Member

It's best practice to use topic branches instead of making changes in your fork's master branch.

Basically, your master branch should only ever contain changes that also exist in the upstream/master.
Periodically, you'd then sync upstream/master back into your fork. https://help.github.com/articles/syncing-a-fork/

If you are stuck with git issues, there are plenty of people who can help you out on both the IRC #voxpupuli channel or in the Puppet Community #voxpupuli slack channel.

@juniorsysadmin juniorsysadmin added enhancement New feature or request and removed needs-rebase labels Oct 13, 2018
@bastelfreak
Copy link
Member

Could you rebase against our master branch and add zabbix 4 to our acceptance tests at https://github.com/voxpupuli/puppet-zabbix/tree/master/spec/acceptance ?

@bastelfreak
Copy link
Member

Thanks @Lord-Y. Can you take a look at the used email address in your commits? It isn't associated with your github account.

@Lord-Y
Copy link
Contributor Author

Lord-Y commented Oct 14, 2018

@bastelfreak Sorry, I'll make sure to better use git next time I'll commit, email, fork, rebase and else

@bastelfreak
Copy link
Member

Hey, that's totally fine, nothing to worry about. You can always ping us in our IRC channel #voxpupuli on freenode or at https://puppetcommunity.slack.com if you've questions. It should be enough to add yohann@lord-y.com to your github profile. The address seems to be missing.

@bastelfreak bastelfreak merged commit dea2ef4 into voxpupuli:master Oct 14, 2018
@alexjfisher alexjfisher changed the title Add Zabbix 4.0 compatibility Add Zabbix 4.0 compatibility and new config_mode parameter Oct 15, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants